radboy 0.0.355__py3-none-any.whl → 0.0.356__py3-none-any.whl

radboy/DB/Prompt.py

@@ -2027,7 +2027,14 @@ last month = today-30d
                             for f in location_fields:
                                 tmp.append(or_(getattr(db.Entry,f)>=0.0001))
                             results_query=results_query.filter(or_(*tmp))
-                            results=results_query.all()
+
+                            LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
+                            if not isinstance(LookUpState,bool):
+                                LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=True,literal=False)
+                            if LookUpState == True:
+                                results=results_query.order_by(db.Entry.Timestamp.asc()).all()
+                            else:
+                                results=results_query.order_by(db.Entry.Timestamp.desc()).all()
                             ct=len(results)
                             if ct < 1:
                                 print(f"{Fore.light_steel_blue}Nothing in {Fore.slate_blue_1}Bld{Fore.light_red}LS!{Style.reset}")
@@ -2037,7 +2044,7 @@ last month = today-30d
                             master_total_crv=0
                             master_total_tax=0
                             master_total_tax_crv=0
-
+                            
                             for num,i in enumerate(results):
                                 getExtras(i.EntryId,extras)
                                 msg=f'{"*"*os.get_terminal_size().columns}\n{Fore.light_green}{num}{Fore.light_magenta}/{Fore.orange_3}{num+1} of {Fore.light_red}{ct}[{Fore.dark_slate_gray_1}EID{Fore.orange_3}]{Fore.dark_violet_1b}{i.EntryId}{Style.reset} |-| {Fore.light_yellow}{i.Name}|{Fore.light_salmon_1}[{Fore.light_red}BCD]{i.rebar()}{Fore.medium_violet_red}|[{Fore.light_red}CD{Fore.medium_violet_red}]{i.cfmt(i.Code)} {Style.reset}|-| '
@@ -2141,7 +2148,13 @@ last month = today-30d
                             for f in location_fields:
                                 tmp.append(or_(getattr(db.Entry,f)>=0.0001))
                             results_query=results_query.filter(or_(*tmp))
-                            results=results_query.all()
+                            LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
+                            if not isinstance(LookUpState,bool):
+                                LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=True,literal=False)
+                            if LookUpState == True:
+                                results=results_query.order_by(db.Entry.Timestamp.asc()).all()
+                            else:
+                                results=results_query.order_by(db.Entry.Timestamp.desc()).all()
                             ct=len(results)
                             if ct < 1:
                                 msg=f"{Fore.light_steel_blue}Nothing in {Fore.slate_blue_1}Bld{Fore.light_red}LS!{Style.reset}"
@@ -2273,7 +2286,13 @@ last month = today-30d
                                 for f in location_fields:
                                     tmp.append(or_(getattr(db.Entry,f)>=0.0001))
                                 results_query=results_query.filter(or_(*tmp))
-                                results=results_query.all()
+                                LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
+                                if not isinstance(LookUpState,bool):
+                                    LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=True,literal=False)
+                                if LookUpState == True:
+                                    results=results_query.order_by(db.Entry.Timestamp.asc()).all()
+                                else:
+                                    results=results_query.order_by(db.Entry.Timestamp.desc()).all()
                                 ct=len(results)
                                 if ct < 1:
                                     print(f"{Fore.light_steel_blue}Nothing in {Fore.slate_blue_1}Bld{Fore.light_red}LS!{Style.reset}")
@@ -2404,7 +2423,13 @@ last month = today-30d
                                 for f in location_fields:
                                     tmp.append(or_(getattr(db.Entry,f)>=0.0001))
                                 results_query=results_query.filter(or_(*tmp))
-                                results=results_query.all()
+                                LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
+                                if not isinstance(LookUpState,bool):
+                                    LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=True,literal=False)
+                                if LookUpState == True:
+                                    results=results_query.order_by(db.Entry.Timestamp.asc()).all()
+                                else:
+                                    results=results_query.order_by(db.Entry.Timestamp.desc()).all()
                                 ct=len(results)
                                 if ct < 1:
                                     msg=f"{Fore.light_steel_blue}Nothing in {Fore.slate_blue_1}Bld{Fore.light_red}LS!{Style.reset}"
@@ -2517,7 +2542,13 @@ last month = today-30d
                             for f in location_fields:
                                 tmp.append(or_(getattr(db.Entry,f)!=0,getattr(db.Entry,f)!=None))
                             results_query=results_query.filter(or_(*tmp))
-                            results=results_query.all()
+                            LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
+                            if not isinstance(LookUpState,bool):
+                                LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=True,literal=False)
+                            if LookUpState == True:
+                                results=results_query.order_by(db.Entry.Timestamp.asc()).all()
+                            else:
+                                results=results_query.order_by(db.Entry.Timestamp.desc()).all()
                             ct=len(results)
                             if ct < 1:
                                 print(f"{Fore.light_steel_blue}Nothing in {Fore.slate_blue_1}Bld{Fore.light_red}LS!{Style.reset}")
@@ -2623,7 +2654,13 @@ last month = today-30d
                             for f in location_fields:
                                 tmp.append(or_(getattr(db.Entry,f)!=0,getattr(db.Entry,f)!=None))
                             results_query=results_query.filter(or_(*tmp))
-                            results=results_query.all()
+                            LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
+                            if not isinstance(LookUpState,bool):
+                                LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=True,literal=False)
+                            if LookUpState == True:
+                                results=results_query.order_by(db.Entry.Timestamp.asc()).all()
+                            else:
+                                results=results_query.order_by(db.Entry.Timestamp.desc()).all()
                             ct=len(results)
                             if ct < 1:
                                 msg=f"{Fore.light_steel_blue}Nothing in {Fore.slate_blue_1}Bld{Fore.light_red}LS!{Style.reset}"
@@ -2752,95 +2789,102 @@ last month = today-30d
                                 for f in location_fields:
                                     tmp.append(or_(getattr(db.Entry,f)!=0,getattr(db.Entry,f)!=None))
                                 results_query=results_query.filter(or_(*tmp))
-                                results=results_query.all()
+                                LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
+                                if not isinstance(LookUpState,bool):
+                                    LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=True,literal=False)
+                                if LookUpState == True:
+                                    results=results_query.order_by(db.Entry.Timestamp.asc()).all()
+                                else:
+                                    results=results_query.order_by(db.Entry.Timestamp.desc()).all()
                                 ct=len(results)
                                 if ct < 1:
                                     print(f"{Fore.light_steel_blue}Nothing in {Fore.slate_blue_1}Bld{Fore.light_red}LS!{Style.reset}")
                                     continue
-                            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
 
-                            for num,i in enumerate(results):
-                                getExtras(i.EntryId,extras)
-                                msg=f'{"*"*os.get_terminal_size().columns}\n{Fore.light_green}{num}{Fore.light_magenta}/{Fore.orange_3}{num+1} of {Fore.light_red}{ct}[{Fore.dark_slate_gray_1}EID{Fore.orange_3}]{Fore.dark_violet_1b}{i.EntryId}{Style.reset} |-| {Fore.light_yellow}{i.Name}|{Fore.light_salmon_1}[{Fore.light_red}BCD]{i.rebar()}{Fore.medium_violet_red}|[{Fore.light_red}CD{Fore.medium_violet_red}]{i.cfmt(i.Code)} {Style.reset}|-| '
-                                colormapped=[
-                                Fore.deep_sky_blue_4c,
-                                Fore.spring_green_4,
-                                Fore.turquoise_4,
-                                Fore.dark_cyan,
-                                Fore.deep_sky_blue_2,
-                                Fore.spring_green_2a,
-                                Fore.medium_spring_green,
-                                Fore.steel_blue,
-                                Fore.cadet_blue_1,
-                                Fore.aquamarine_3,
-                                Fore.purple_1a,
-                                Fore.medium_purple_3a,
-                                Fore.slate_blue_1,
-                                Fore.light_slate_grey,
-                                Fore.dark_olive_green_3a,
-                                Fore.deep_pink_4c,
-                                Fore.orange_3,
-                                ]
-                                total=0
-                                crv=0
-                                tax=0
-                                tax_crv=0
-                                for n2,f in enumerate(location_fields):
-                                    try:
+                                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
+
+                                for num,i in enumerate(results):
+                                    getExtras(i.EntryId,extras)
+                                    msg=f'{"*"*os.get_terminal_size().columns}\n{Fore.light_green}{num}{Fore.light_magenta}/{Fore.orange_3}{num+1} of {Fore.light_red}{ct}[{Fore.dark_slate_gray_1}EID{Fore.orange_3}]{Fore.dark_violet_1b}{i.EntryId}{Style.reset} |-| {Fore.light_yellow}{i.Name}|{Fore.light_salmon_1}[{Fore.light_red}BCD]{i.rebar()}{Fore.medium_violet_red}|[{Fore.light_red}CD{Fore.medium_violet_red}]{i.cfmt(i.Code)} {Style.reset}|-| '
+                                    colormapped=[
+                                    Fore.deep_sky_blue_4c,
+                                    Fore.spring_green_4,
+                                    Fore.turquoise_4,
+                                    Fore.dark_cyan,
+                                    Fore.deep_sky_blue_2,
+                                    Fore.spring_green_2a,
+                                    Fore.medium_spring_green,
+                                    Fore.steel_blue,
+                                    Fore.cadet_blue_1,
+                                    Fore.aquamarine_3,
+                                    Fore.purple_1a,
+                                    Fore.medium_purple_3a,
+                                    Fore.slate_blue_1,
+                                    Fore.light_slate_grey,
+                                    Fore.dark_olive_green_3a,
+                                    Fore.deep_pink_4c,
+                                    Fore.orange_3,
+                                    ]
+                                    total=0
+                                    crv=0
+                                    tax=0
+                                    tax_crv=0
+                                    for n2,f in enumerate(location_fields):
+                                        try:
+                                            if getattr(i,f) != 0:
+                                                total+=getattr(i,f)
+                                        except Exception as e:
+                                            print(e)
+                                    for n2,f in enumerate(location_fields):
                                         if getattr(i,f) != 0:
-                                            total+=getattr(i,f)
+                                            msg2=f'{colormapped[n2]}{f} = {round(getattr(i,f),ROUNDTO)}{Style.reset}'
+                                            if n2 < len(location_fields):
+                                                msg2+=","
+                                            msg+=msg2
+                                    master_total+=total*round(i.Price,3)
+
+                                    crv+=(round(i.CRV,ROUNDTO)*total)
+                                    tax+=(round(i.Tax,ROUNDTO)*total)
+                                    if tax == 0 and crv > 0:
+                                        tax_crv=(round(i.CRV,ROUNDTO)*total)
+                                    else:
+                                        tax_crv+=((round(i.Tax,ROUNDTO)*total)+(round(i.CRV,ROUNDTO)*total))
+                                    master_total_tax+=tax
+                                    master_total_crv+=crv
+                                    master_total_tax_crv+=tax_crv
+                                    tax_crv=round(tax_crv,ROUNDTO)
+                                    try:
+                                        super_total=(round(round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO)/getSuperTotal(results,location_fields,colormapped)['final total'],ROUNDTO))*100
                                     except Exception as e:
+                                        p1=round(round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO))
+                                        p2=getSuperTotal(results,location_fields,colormapped)['final total']
                                         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}'
-                                        if n2 < len(location_fields):
-                                            msg2+=","
-                                        msg+=msg2
-                                master_total+=total*round(i.Price,3)
-
-                                crv+=(round(i.CRV,ROUNDTO)*total)
-                                tax+=(round(i.Tax,ROUNDTO)*total)
-                                if tax == 0 and crv > 0:
-                                    tax_crv=(round(i.CRV,ROUNDTO)*total)
-                                else:
-                                    tax_crv+=((round(i.Tax,ROUNDTO)*total)+(round(i.CRV,ROUNDTO)*total))
-                                master_total_tax+=tax
-                                master_total_crv+=crv
-                                master_total_tax_crv+=tax_crv
-                                tax_crv=round(tax_crv,ROUNDTO)
-                                try:
-                                    super_total=(round(round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO)/getSuperTotal(results,location_fields,colormapped)['final total'],ROUNDTO))*100
-                                except Exception as e:
-                                    p1=round(round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO))
-                                    p2=getSuperTotal(results,location_fields,colormapped)['final total']
-                                    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']})
-{'*'*os.get_terminal_size().columns}{Style.reset}"""
+                                        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']})
+    {'*'*os.get_terminal_size().columns}{Style.reset}"""
+                                    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)
+                                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}{round(master_total_tax_crv+master_total,ROUNDTO)}
+                                {Style.reset}"""
                                 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)
-                            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}{round(master_total_tax_crv+master_total,ROUNDTO)}
-                            {Style.reset}"""
-                            print(msg)
                     elif cmd.lower() in ['esbld-','export search build -','export_search_build-','exp scan build-','exp_scan_bld-']:
                         extras=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Show Extras?",helpText="extra data attached to each entry yes or no",data="boolean")
                         if extras in [None,'d',False]:
@@ -2878,98 +2922,104 @@ last month = today-30d
                                 for f in location_fields:
                                     tmp.append(or_(getattr(db.Entry,f)!=0,getattr(db.Entry,f)!=None))
                                 results_query=results_query.filter(or_(*tmp))
-                                results=results_query.all()
+                                LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
+                                if not isinstance(LookUpState,bool):
+                                    LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=True,literal=False)
+                                if LookUpState == True:
+                                    results=results_query.order_by(db.Entry.Timestamp.asc()).all()
+                                else:
+                                    results=results_query.order_by(db.Entry.Timestamp.desc()).all()
                                 ct=len(results)
                                 if ct < 1:
                                     msg=f"{Fore.light_steel_blue}Nothing in {Fore.slate_blue_1}Bld{Fore.light_red}LS!{Style.reset}"
                                     db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)
                                     print(msg)
                                     continue
-                            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
-
-                            for num,i in enumerate(results):
-                                getExtras(i.EntryId,extras)
-                                msg=f'{"*"*os.get_terminal_size().columns}\n{Fore.light_green}{num}{Fore.light_magenta}/{Fore.orange_3}{num+1} of {Fore.light_red}{ct}[{Fore.dark_slate_gray_1}EID{Fore.orange_3}]{Fore.dark_violet_1b}{i.EntryId}{Style.reset} |-| {Fore.light_yellow}{i.Name}|{Fore.light_salmon_1}[{Fore.light_red}BCD]{i.rebar()}{Fore.medium_violet_red}|[{Fore.light_red}CD{Fore.medium_violet_red}]{i.cfmt(i.Code)} {Style.reset}|-| '
-                                colormapped=[
-                                Fore.deep_sky_blue_4c,
-                                Fore.spring_green_4,
-                                Fore.turquoise_4,
-                                Fore.dark_cyan,
-                                Fore.deep_sky_blue_2,
-                                Fore.spring_green_2a,
-                                Fore.medium_spring_green,
-                                Fore.steel_blue,
-                                Fore.cadet_blue_1,
-                                Fore.aquamarine_3,
-                                Fore.purple_1a,
-                                Fore.medium_purple_3a,
-                                Fore.slate_blue_1,
-                                Fore.light_slate_grey,
-                                Fore.dark_olive_green_3a,
-                                Fore.deep_pink_4c,
-                                Fore.orange_3,
-                                ]
-                                total=0
-                                crv=0
-                                tax=0
-                                tax_crv=0
-                                for n2,f in enumerate(location_fields):
-                                    try:
+                                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
+
+                                for num,i in enumerate(results):
+                                    getExtras(i.EntryId,extras)
+                                    msg=f'{"*"*os.get_terminal_size().columns}\n{Fore.light_green}{num}{Fore.light_magenta}/{Fore.orange_3}{num+1} of {Fore.light_red}{ct}[{Fore.dark_slate_gray_1}EID{Fore.orange_3}]{Fore.dark_violet_1b}{i.EntryId}{Style.reset} |-| {Fore.light_yellow}{i.Name}|{Fore.light_salmon_1}[{Fore.light_red}BCD]{i.rebar()}{Fore.medium_violet_red}|[{Fore.light_red}CD{Fore.medium_violet_red}]{i.cfmt(i.Code)} {Style.reset}|-| '
+                                    colormapped=[
+                                    Fore.deep_sky_blue_4c,
+                                    Fore.spring_green_4,
+                                    Fore.turquoise_4,
+                                    Fore.dark_cyan,
+                                    Fore.deep_sky_blue_2,
+                                    Fore.spring_green_2a,
+                                    Fore.medium_spring_green,
+                                    Fore.steel_blue,
+                                    Fore.cadet_blue_1,
+                                    Fore.aquamarine_3,
+                                    Fore.purple_1a,
+                                    Fore.medium_purple_3a,
+                                    Fore.slate_blue_1,
+                                    Fore.light_slate_grey,
+                                    Fore.dark_olive_green_3a,
+                                    Fore.deep_pink_4c,
+                                    Fore.orange_3,
+                                    ]
+                                    total=0
+                                    crv=0
+                                    tax=0
+                                    tax_crv=0
+                                    for n2,f in enumerate(location_fields):
+                                        try:
+                                            if getattr(i,f) != 0:
+                                                total+=getattr(i,f)
+                                        except Exception as e:
+                                            print(e)
+                                    for n2,f in enumerate(location_fields):
                                         if getattr(i,f) != 0:
-                                            total+=getattr(i,f)
+                                            msg2=f'{colormapped[n2]}{f} = {round(getattr(i,f),ROUNDTO)}{Style.reset}'
+                                            if n2 < len(location_fields):
+                                                msg2+=","
+                                            msg+=msg2
+                                    master_total+=total*round(i.Price,ROUNDTO)
+
+                                    crv+=(round(i.CRV,ROUNDTO)*total)
+                                    tax+=(round(i.Tax,ROUNDTO)*total)
+                                    if tax == 0 and crv > 0:
+                                        tax_crv=(round(i.CRV,ROUNDTO)*total)
+                                    else:
+                                        tax_crv+=((round(i.Tax,ROUNDTO)*total)+(round(i.CRV,ROUNDTO)*total))
+                                    master_total_tax+=tax
+                                    master_total_crv+=crv
+                                    master_total_tax_crv+=tax_crv
+                                    tax_crv=round(tax_crv,ROUNDTO)
+                                    try:
+                                        super_total=(round(round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO)/getSuperTotal(results,location_fields,colormapped)['final total'],ROUNDTO))*100
                                     except Exception as e:
+                                        p1=round(round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO))
+                                        p2=getSuperTotal(results,location_fields,colormapped)['final total']
                                         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}'
-                                        if n2 < len(location_fields):
-                                            msg2+=","
-                                        msg+=msg2
-                                master_total+=total*round(i.Price,ROUNDTO)
-
-                                crv+=(round(i.CRV,ROUNDTO)*total)
-                                tax+=(round(i.Tax,ROUNDTO)*total)
-                                if tax == 0 and crv > 0:
-                                    tax_crv=(round(i.CRV,ROUNDTO)*total)
-                                else:
-                                    tax_crv+=((round(i.Tax,ROUNDTO)*total)+(round(i.CRV,ROUNDTO)*total))
-                                master_total_tax+=tax
-                                master_total_crv+=crv
-                                master_total_tax_crv+=tax_crv
-                                tax_crv=round(tax_crv,ROUNDTO)
-                                try:
-                                    super_total=(round(round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO)/getSuperTotal(results,location_fields,colormapped)['final total'],ROUNDTO))*100
-                                except Exception as e:
-                                    p1=round(round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO))
-                                    p2=getSuperTotal(results,location_fields,colormapped)['final total']
-                                    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']})
-{'*'*os.get_terminal_size().columns}{Style.reset}"""
+                                        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']})
+    {'*'*os.get_terminal_size().columns}{Style.reset}"""
+                                    print(msg)
+                                    db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)
+                                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)
+                                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}{round(master_total_tax_crv+master_total,ROUNDTO)}
+                                {Style.reset}"""
                                 print(msg)
                                 db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)
-                            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)
-                            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}{round(master_total_tax_crv+master_total,ROUNDTO)}
-                            {Style.reset}"""
-                            print(msg)
-                            db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)
                         #end#
                     elif cmd.lower() in ['cdp','clipboard_default_paste','clipboard default paste']:
                         with db.Session(db.ENGINE) as session:

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.355'
+VERSION='0.0.356'

{radboy-0.0.355.dist-info → radboy-0.0.356.dist-info}/METADATA

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

{radboy-0.0.355.dist-info → radboy-0.0.356.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=XXy-o5Z_yOgrgHNju4iqM3h7xhRBkNIoHG1qePtBnGY,41316
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=l7aeiQFOIf4b-G-Bme-dq5mVNcXR0fcKe1pCF84LoDo,17
+radboy/__init__.py,sha256=Qb1JlkcDptfCs8V8tmn6WiII5clwiq17RqiYbV7l_Mg,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
@@ -83,7 +83,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=rm_LslQaC8xCAuPQrYfiTee7Ukv9ujDNPfUDFANE058,185501
+radboy/DB/Prompt.py,sha256=6rKNKKo_H8o_epCYb-bfkyAR_1OR5qetCrjLo26j_pk,190515
 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
@@ -107,7 +107,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=eFf4YU6ZJnPU_afzh_RYTQy3jk0786cej94lxGPkVOI,270764
+radboy/DB/__pycache__/Prompt.cpython-313.pyc,sha256=kIsYjCN7fRiO5kCcI5zZgb-DCTdctC_miZkqe0yNZq8,275399
 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
@@ -386,7 +386,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=0h4rkorAoflVy3YLLKGTy_E-UdVAqh1I2yFGo3le6Js,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=hqEkGlkWy7tm67wZcZkiUpZVBFgEBGcu9FTr00054gM,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
@@ -411,7 +411,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.355.dist-info/METADATA,sha256=SusWRth57pcnnu-GhF3Ulic7o4cfHC4zqL2sMz4lb64,794
-radboy-0.0.355.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.355.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.355.dist-info/RECORD,,
+radboy-0.0.356.dist-info/METADATA,sha256=e2SDtdug1qK3Ckd55uTRQZPeh12QuV3S_vtvrg7-Ds8,794
+radboy-0.0.356.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.356.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.356.dist-info/RECORD,,