radboy 0.0.374__tar.gz → 0.0.376__tar.gz

{radboy-0.0.374 → radboy-0.0.376}/PKG-INFO

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

radboy-0.0.376/STDOUT.TXT

@@ -0,0 +1,19 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"esbld"
+#USER INPUT# -> :"esbld"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"esbld-"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"sbld-"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"lsbld"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.376"

{radboy-0.0.374 → radboy-0.0.376}/pyproject.toml

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

{radboy-0.0.374 → radboy-0.0.376}/radboy/DB/Prompt.py

@@ -807,6 +807,173 @@ class Prompt(object):
             
 
     def __init2__(self,func,ptext='do what',helpText='',data={},noHistory=False,qc=None,replace_ptext=None):
+        '''
+        lsbld - bldls()
+        lsbld- - bldls(minus=True)
+        bldlse - bldls(bldlse=True)
+        bldlse - bldls(bldlse=True,minus=True)
+
+        sbld - bldls(sbld=True)
+        sbld- bldls(sbld=True,minus=True)
+        esbld - bldls(bldlse=True,sbld=True)
+        esblb- bldls(bldlse=True,sbld=True,minus=True)
+        '''
+        def bldls(bldlse=False,sbld=False,minus=False):
+            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]:
+                extras=False
+            msg=''
+            if bldlse:
+                db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file,clear_only=True)
+            with db.Session(db.ENGINE) as session:
+                results_query=session.query(db.Entry).filter(db.Entry.InList==True)
+                if sbld:
+                    def mkT(text,data):
+                        return text
+                    code=Prompt.__init2__(None,func=mkT,ptext="Code|Barcode|Name: ",helpText="find by code,barcode,name",data='')
+                    if code in [None,'d']:
+                        return
+                    results_query=results_query.filter(
+                        db.or_(
+                            db.Entry.Code==code,
+                            db.Entry.Barcode==code,
+                            db.Entry.Barcode.icontains(code),
+                            db.Entry.Code.icontains(code),
+                            db.Entry.Name.icontains(code)
+                            )
+                        )  
+                location_fields=["Shelf","BackRoom","Display_1","Display_2","Display_3","Display_4","Display_5","Display_6","ListQty","SBX_WTR_DSPLY","SBX_CHP_DSPLY","SBX_WTR_KLR","FLRL_CHP_DSPLY","FLRL_WTR_DSPLY","WD_DSPLY","CHKSTND_SPLY","Distress"]
+                z=Prompt.mkfield_list(None,location_fields)
+                if z in [[],None]:
+                    z=location_fields
+                location_fields=z
+                tmp=[]
+                for f in location_fields:
+                    if not minus:
+                        tmp.append(or_(getattr(db.Entry,f)>=0.0001))
+                    else:
+                        tmp.append(or_(getattr(db.Entry,f)!=0,getattr(db.Entry,f)!=None))
+
+                results_query=results_query.filter(or_(*tmp))
+                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)
+                    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
+
+                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
+                    i.Tax=round(i.Tax,ROUNDTO)
+                    i.CRV=round(i.CRV,ROUNDTO)
+                    i.Price=round(i.Price,ROUNDTO)
+                    session.commit()
+                    if not minus:
+                        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:
+                                msg2=f'{colormapped[n2]}{f} = {round(getattr(i,f),ROUNDTO)}{Style.reset}'
+                                if n2 < len(location_fields):
+                                    msg2+=","
+                                msg+=msg2
+                    else:
+                        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:
+                                msg2=f'{colormapped[n2]}{f} = {round(getattr(i,f),3)}{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}"""
+                    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)
+                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}"""
+                if bldlse:
+                    db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)
+                print(msg)
         while True:
             try:
                 lastTime=db.detectGetOrSet("PromptLastDTasFloat",datetime.now().timestamp())
@@ -2013,6 +2180,8 @@ last month = today-30d
                         result=global_search_for_text()
                         return func(result,data)
                     elif cmd.lower() in ["bldls","build","buildls","build list","bld ls",'lsbld','list build','ls bld','bld']:
+                        bldls()
+                        '''
                         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]:
                             extras=False
@@ -2127,13 +2296,13 @@ last month = today-30d
 {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)
+                            print(msg)'''
                     elif cmd.lower() in ['quick price','qprc','price']:
                         t=TM.Tasks.TasksMode.pricing(None)
                         if t is not None:
                             return func(str(t),data)
                     elif cmd.lower() in ["bldlse","builde","buildlse","build list export ","bld ls exp",'elsbld','export list build','exp ls bld','ebld']:
-                        extras=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Show Extras?",helpText="extra data attached to each entry yes or no",data="boolean")
+                        '''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]:
                             extras=False
                         msg=''
@@ -2252,7 +2421,21 @@ last month = today-30d
                             {Style.reset}"""
                             db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)
                             print(msg)
+                        '''
+                        '''
+                        lsbld - bldls()
+                        lsbld- - bldls(minus=True)
+                        bldlse - bldls(bldlse=True)
+                        bldlse - bldls(bldlse=True,minus=True)
+
+                        sbld - bldls(sbld=True)
+                        sbld- bldls(sbld=True,minus=True)
+                        esbld - bldls(bldlse=True,sbld=True)
+                        esblb- bldls(bldlse=True,sbld=True,minus=True)
+                        '''
+                        bldls(bldlse=True)
                     elif cmd.lower() in ['sbld','search build','search_build','scan build','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]:
                             extras=False
@@ -2387,7 +2570,21 @@ last month = today-30d
 {Fore.medium_violet_red}PercentOfTotal({round(super_total,ROUNDTO)}) of Total({getSuperTotal(results,location_fields,colormapped)['final total']})
                             {Style.reset}"""
                             print(msg)
+                        '''
+                        '''
+                        lsbld - bldls()
+                        lsbld- - bldls(minus=True)
+                        bldlse - bldls(bldlse=True)
+                        bldlse - bldls(bldlse=True,minus=True)
+
+                        sbld - bldls(sbld=True)
+                        sbld- bldls(sbld=True,minus=True)
+                        esbld - bldls(bldlse=True,sbld=True)
+                        esblb- bldls(bldlse=True,sbld=True,minus=True)
+                        '''
+                        bldls(sbld=True)
                     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]:
                             extras=False
@@ -2528,7 +2725,21 @@ last month = today-30d
                             {Style.reset}"""
                             db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)
                             print(msg)
+                        '''
+                        '''
+                        lsbld - bldls()
+                        lsbld- - bldls(minus=True)
+                        bldlse - bldls(bldlse=True)
+                        bldlse - bldls(bldlse=True,minus=True)
+
+                        sbld - bldls(sbld=True)
+                        sbld- bldls(sbld=True,minus=True)
+                        esbld - bldls(bldlse=True,sbld=True)
+                        esblb- bldls(bldlse=True,sbld=True,minus=True)
+                        '''
+                        bldls(bldlse=True,sbld=True)
                     elif cmd.lower() in ["bldls-","build-","buildls-","build list -","bld ls -",'lsbld-','list build -','ls bld -','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]:
                             extras=False
@@ -2638,7 +2849,21 @@ last month = today-30d
 {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)
+                        '''
+                        '''
+                        lsbld - bldls()
+                        lsbld- - bldls(minus=True)
+                        bldlse - bldls(bldlse=True)
+                        bldlse - bldls(bldlse=True,minus=True)
+
+                        sbld - bldls(sbld=True)
+                        sbld- bldls(sbld=True,minus=True)
+                        esbld - bldls(bldlse=True,sbld=True)
+                        esblb- bldls(bldlse=True,sbld=True,minus=True)
+                        '''
+                        bldls(minus=True)
                     elif cmd.lower() in ["bldlse-","builde-","buildlse-","build list export -","bld ls exp -",'elsbld-','export list build -','exp ls bld -','ebld-']:
+                        '''
                         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]:
                             extras=False
@@ -2755,7 +2980,21 @@ last month = today-30d
                             {Style.reset}"""
                             print(msg)
                             db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)
+                        '''
+                        '''
+                        lsbld - bldls()
+                        lsbld- - bldls(minus=True)
+                        bldlse - bldls(bldlse=True)
+                        bldlse- - bldls(bldlse=True,minus=True)
+
+                        sbld - bldls(sbld=True)
+                        sbld- bldls(sbld=True,minus=True)
+                        esbld - bldls(bldlse=True,sbld=True)
+                        esblb- bldls(bldlse=True,sbld=True,minus=True)
+                        '''
+                        bldls(bldlse=True,minus=True)
                     elif cmd.lower() in ['sbld-','search build -','search_build-','scan build-','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]:
                             extras=False
@@ -2886,7 +3125,21 @@ last month = today-30d
     {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)
+                        '''
+                        '''
+                            lsbld - bldls()
+                            lsbld- - bldls(minus=True)
+                            bldlse - bldls(bldlse=True)
+                            bldlse - bldls(bldlse=True,minus=True)
+
+                            sbld - bldls(sbld=True)
+                            sbld- bldls(sbld=True,minus=True)
+                            esbld - bldls(bldlse=True,sbld=True)
+                            esblb- bldls(bldlse=True,sbld=True,minus=True)
+                        '''
+                        bldls(sbld=True,minus=True)
                     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]:
                             extras=False
@@ -3022,6 +3275,19 @@ last month = today-30d
                                 print(msg)
                                 db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)
                         #end#
+                        '''
+                        '''
+                            lsbld - bldls()
+                            lsbld- - bldls(minus=True)
+                            bldlse - bldls(bldlse=True)
+                            bldlse - bldls(bldlse=True,minus=True)
+
+                            sbld - bldls(sbld=True)
+                            sbld- bldls(sbld=True,minus=True)
+                            esbld - bldls(bldlse=True,sbld=True)
+                            esblb- bldls(bldlse=True,sbld=True,minus=True)
+                        '''
+                        bldls(bldlse=True,sbld=True,minus=True)
                     elif cmd.lower() in ['cdp','clipboard_default_paste','clipboard default paste']:
                         with db.Session(db.ENGINE) as session:
                             dflt=session.query(db.ClipBoord).filter(db.ClipBoord.defaultPaste==True).order_by(db.ClipBoord.doe.desc()).first()

{radboy-0.0.374 → radboy-0.0.376}/radboy/DayLog/DayLogger.py

@@ -18,7 +18,8 @@ from radboy.DB.CoinCombo import *
 from radboy.DayLog.Wavelength4Freq import HoleSize
 from radboy.DayLog.TaxiFares import TaxiFare
 from radboy.Compare.Compare import *
-
+from sqlalchemy.sql import functions as func
+from collections import OrderedDict
 
 class DayLogger:
     helpText=f"""
@@ -754,7 +755,9 @@ fxtbl - update table with correct columns
                     """)
                 if totals[i] >= occurances and totals[i] <= occurances_max: 
                     print(msg)
-
+    def f_orderByTotalValue(self,query):
+        #just a dummy extra filtering can be here
+        return query
 
     def TotalSpent(self):
         LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
@@ -769,6 +772,22 @@ fxtbl - update table with correct columns
         #cost report
         #export results Both text and xlsx
         #yes no
+        orderByTotalValue=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Order Final Results by total qty value[y/N]:",helpText="yes or no; default is No.",data="boolean")
+        
+        if orderByTotalValue in [None,]:
+            return
+        elif orderByTotalValue in ['d',]:
+            orderByTotalValue=False
+
+        reverse=True
+        if orderByTotalValue:
+            reverse=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Order Asc(True/Yes/First Line Newest or Smallest & Last Line Biggest or Oldest)[Default]/Desc(false/no/First Line Oldest or Biggest & Last Line Newest or Smallest):",helpText="yes or no; default is yes.",data="boolean")
+            
+            if reverse in [None,]:
+                return
+            elif reverse in ['d',]:
+                reverse=True
+
         graph_it=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Graph Results (if possible)[y/N]:",helpText="yes or no; default is No.",data="boolean")
         
         if graph_it in [None,]:
@@ -920,6 +939,9 @@ fxtbl - update table with correct columns
                         x=GraphIt(query,fields_for_total)
                         if x is None:
                             return
+                    if orderByTotalValue:
+                        query=self.f_orderByTotalValue(query)
+                    
                     query=query.all()
                 else:
                     query=session.query(DayLog).filter(DayLog.DayLogDate.between(date_from,date_to))
@@ -933,6 +955,9 @@ fxtbl - update table with correct columns
                         x=GraphIt(query,fields_for_total)
                         if x is None:
                             return
+
+                    if orderByTotalValue:
+                        query=self.f_orderByTotalValue(query)
                     query=query.all()
             else:
                 exclude_code=Prompt.__init2__(None,func=FormBuilderMkText,ptext="exclude this code from results:",helpText="yes or no",data="boolean")
@@ -957,6 +982,10 @@ fxtbl - update table with correct columns
                             query=query.order_by(DayLog.DayLogDate.asc())
                         elif LookUpState == False:
                             query=query.order_by(DayLog.DayLogDate.desc())
+
+                        if orderByTotalValue:
+                            query=self.f_orderByTotalValue(query)
+                        
                     else:
                         filt=[]
                         for q in code:
@@ -977,6 +1006,8 @@ fxtbl - update table with correct columns
                             query=query.order_by(DayLog.DayLogDate.asc())
                         elif LookUpState == False:
                             query=query.order_by(DayLog.DayLogDate.desc())
+                        if orderByTotalValue:
+                            query=self.f_orderByTotalValue(query)
                     if export:
                         exporter_excel(query,xlsx_cr_export)
                     if graph_it:
@@ -984,6 +1015,8 @@ fxtbl - update table with correct columns
                         if x is None:
                             return
 
+                    if orderByTotalValue:
+                        query=self.f_orderByTotalValue(query)
                     query=query.all()
                 else:
                     if not exclude_code:
@@ -1003,6 +1036,8 @@ fxtbl - update table with correct columns
                             query=query.order_by(DayLog.DayLogDate.asc())
                         elif LookUpState == False:
                             query=query.order_by(DayLog.DayLogDate.desc())
+                        if orderByTotalValue:
+                            query=self.f_orderByTotalValue(query)
                     else:
                         filt=[]
                         for q in code:
@@ -1026,19 +1061,23 @@ fxtbl - update table with correct columns
                             query=query.order_by(DayLog.DayLogDate.asc())
                         elif LookUpState == False:
                             query=query.order_by(DayLog.DayLogDate.desc())
+                        if orderByTotalValue:
+                            query=self.f_orderByTotalValue(query)
                     if export:
                         exporter_excel(query,xlsx_cr_export)
                     if graph_it:
                         x=GraphIt(query,fields_for_total)
                         if x is None:
                             return
+                    if orderByTotalValue:
+                        query=self.f_orderByTotalValue(query)
                     query=query.all()
                 
-            totals={}
-            totals_dl={}
-            total_price={}
-            total_tax={}
-            total_crv={}
+            totals=OrderedDict({})
+            totals_dl=OrderedDict({})
+            total_price=OrderedDict({})
+            total_tax=OrderedDict({})
+            total_crv=OrderedDict({})
             if export:
                 msg=f'{datetime.now()}[NOW]/[{date_from}(From)]-[{date_to}(To)]'
                 logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=text_cr_export,clear_only=True)
@@ -1098,6 +1137,19 @@ fxtbl - update table with correct columns
                 #    return
                 #else:
                 #    pass
+        #
+        if orderByTotalValue:
+            totals_ordered_keys=OrderedDict({})
+            for key in totals:
+                totals_ordered_keys[key]=round(((total_crv[key]+total_tax[key]+total_price[key])/total_expense)*100,ROUNDTO)
+            #need to sort dictionary
+            #according to -> round(((total_crv[key]+total_tax[key]+total_price[key])/total_expense)*100,ROUNDTO)
+            totals_ordered_keys=OrderedDict(sorted(totals_ordered_keys.items(),key=lambda item:item[1],reverse=not reverse))
+            tmp=OrderedDict()
+            for key in totals_ordered_keys.keys():
+                tmp[key]=totals[key]
+            totals=tmp
+
         totals_len=len(totals)
         for num,key in enumerate(totals):
             if LookUpState == True:
@@ -1115,7 +1167,8 @@ fxtbl - update table with correct columns
                 if export:
                     logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=text_cr_export)
                 print(msg)
-        msg3=f"{Fore.orange_red_1}Total Expense:{Fore.light_magenta}{total_expense}{Style.reset}"
+        reverse_state={False:'False - Desc. (First Line Oldest/Biggest,Last Line Newest/Smallest)',True:'True - Asc. (Firt Line Newest/Smallest,Last Line Newest/Biggest)'}
+        msg3=f"{Fore.light_cyan}Final Results Reverse:{reverse_state[reverse]}|{Fore.orange_red_1}Total Expense:{Fore.light_magenta}{total_expense}{Style.reset}"
         print(msg3)
         if export:
             logInput(msg3,user=False,filter_colors=True,maxed_hfl=False,ofile=text_cr_export)

radboy-0.0.376/radboy/__init__.py

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

{radboy-0.0.374 → radboy-0.0.376}/radboy.egg-info/PKG-INFO

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

{radboy-0.0.374 → radboy-0.0.376}/setup.py

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

radboy-0.0.374/STDOUT.TXT

@@ -1,24 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"mksl"
-#USER INPUT# -> :""
-#USER INPUT# -> :"y"
-#USER INPUT# -> :""
-#USER INPUT# -> :"03201519"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"qc"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"esxfe"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"8"
-#USER INPUT# -> :"13.1"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"lu"
-#USER INPUT# -> :"03201519"
-#USER INPUT# -> :""
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.374"

radboy-0.0.374/radboy/__init__.py

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