radboy 0.0.374__tar.gz → 0.0.375__tar.gz

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

@@ -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.375/STDOUT.TXT

@@ -0,0 +1,43 @@
+#USER INPUT# -> :"dl"
+#USER INPUT# -> :"cr"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"true"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"4.1.25"
+#USER INPUT# -> :"4.30.25"
+#USER INPUT# -> :"1"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"cr"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"4.1.25"
+#USER INPUT# -> :"4.30.25"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"cr"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"4.1.25"
+#USER INPUT# -> :"4.30.25"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.375"

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

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

{radboy-0.0.374 → radboy-0.0.375}/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.375/radboy/__init__.py

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

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

@@ -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 → radboy-0.0.375}/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.375"
 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'