radboy 0.0.374__py3-none-any.whl → 0.0.375__py3-none-any.whl

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/__init__.py

@@ -1 +1 @@
-VERSION='0.0.374'
+VERSION='0.0.375'

{radboy-0.0.374.dist-info → radboy-0.0.375.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.374
+Version: 0.0.375
 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.dist-info → radboy-0.0.375.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=RubYMuOG7VFG0QXDgZQKkBcxURJdyRwFQ9wQIx5YVys,17
+radboy/__init__.py,sha256=KkKoK-XRLCOcRxD6MqPSTFGhXXrU0U7EUWZBjTbh3iU,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
@@ -134,13 +134,13 @@ radboy/DB/__pycache__/renderText2Png.cpython-311.pyc,sha256=ivSzvyAeWhsS-a_RcFF8
 radboy/DB/__pycache__/renderText2Png.cpython-312.pyc,sha256=1CUGjOhJw_vC4DNMQ-W5jBXEKp7HzDrq7--x9VyBTo8,8991
 radboy/DB/__pycache__/renderText2Png.cpython-313.pyc,sha256=LDJOo7uFztlxw3ptN8QuHrLkr0GKiAArBu34QiE15iQ,9096
 radboy/DB/__pycache__/testClass.cpython-311.pyc,sha256=nkWap8RuBsWWOB_ZhGbR3ELbnL1F1CHZCi0dpepqw-0,1225
-radboy/DayLog/DayLogger.py,sha256=cs_8XXO0yPbUJEh2V_22ev8ZqhAIODgJatuacGZz_cw,98586
+radboy/DayLog/DayLogger.py,sha256=63N1oJ_5tq1QJPCSLMffhFQgrg4gW8tFOi2Ftb5rSs8,101456
 radboy/DayLog/TaxiFares.py,sha256=3slYjtBcTnRe8IeneJ-_iZJJ3E7alW09f6GWYXPxhOo,10882
 radboy/DayLog/Wavelength4Freq.py,sha256=MfN2EATrN3bbEDgP1qOPjV1Fk8sVnkc_4tgX6sKfSE0,2054
 radboy/DayLog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/DayLog/__pycache__/DayLogger.cpython-311.pyc,sha256=TmRnRZHp5tMTokSEB8hWTxnasi-iJdh6TmYcb_nXGoY,29557
 radboy/DayLog/__pycache__/DayLogger.cpython-312.pyc,sha256=bfDCQZrIhgQYzoUle7roicRE_bhGPYZtIbCRIiDrsxU,68240
-radboy/DayLog/__pycache__/DayLogger.cpython-313.pyc,sha256=9JJ5eSMw7twg7Px0Lf_5dDZRnRLCgic3pkHaqkduHr8,147105
+radboy/DayLog/__pycache__/DayLogger.cpython-313.pyc,sha256=kRcVAtHpS_R-XMHGw5mvx9xtMMJ5s2PY4hZHV4CQumc,149602
 radboy/DayLog/__pycache__/__init__.cpython-311.pyc,sha256=Z5Y4DdVF77LZf6-Of92MDGFdi-IXik1ASQd4AdLNNfQ,231
 radboy/DayLog/__pycache__/__init__.cpython-312.pyc,sha256=lP_GHzSPt5JTrT1jLWiRMFGPmSdJYBn4eRV__OxgJ6s,269
 radboy/DayLog/__pycache__/__init__.cpython-313.pyc,sha256=UQw5v4r7yismC9qcqP0dEme6h-lawbOA5pXYpkqUwFk,148
@@ -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=Y9yK0KEannCV4hOInwUjLrJtq0VQIB3iYXcnNlcPlqs,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=jJdzze-Djxkbo9dbe5opc_tJEHQ0DH3lAj-tMS00_ek,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.374.dist-info/METADATA,sha256=xm2KS2gomT9p-HiGzOzTdS2JnjAdg2WaJaOtJNt_TIw,794
-radboy-0.0.374.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.374.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.374.dist-info/RECORD,,
+radboy-0.0.375.dist-info/METADATA,sha256=Uw2CQ1E_OhRLZC955qPzJ01mDCU1z_U5AGkDtjIvB0U,794
+radboy-0.0.375.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.375.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.375.dist-info/RECORD,,