radboy 0.0.373__tar.gz → 0.0.375__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.373
+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.373 → radboy-0.0.375}/pyproject.toml

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

{radboy-0.0.373 → 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.373 → radboy-0.0.375}/radboy/EntryExtras/Extras.py

@@ -824,6 +824,84 @@ class EntryDataExtrasMenu:
             session.refresh(extra)
             print(extra)
 
+    def edit_extra_field_from_entry(self,barcode=None):
+        with Session(ENGINE) as session:
+            if self.code is None or not isinstance(self.code,str):
+                if barcode != None:
+                    search=barcode
+                else:
+                    search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search? [Barcode,Code,Name]",helpText="searches Barcode,Code,Name",data="string")
+                    if search in [None]:
+                        return
+            else:
+                search=self.code
+            results=session.query(Entry).filter(or_(Entry.Barcode==search,Entry.Code==search,Entry.Barcode.icontains(search),Entry.Code.icontains(search),Entry.Name.icontains(search))).all()
+            ct=len(results)
+            if ct == 0:
+                print("No Results were Found!")
+                return
+            msg=[]
+            for num,i in enumerate(results):
+                msg.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {i.seeShort()}")
+            msg='\n'.join(msg)
+            product=None
+            while True:
+                print(msg)
+                index=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index do you wish to use?",helpText=msg,data="integer")
+                if index in [None,]:
+                    return
+                try:
+                    product=results[index]
+                    break
+                except Exception as e:
+                    print(e)
+            if product in [None,]:
+                return
+            print(f"edit_extra_field_from_entry(barcode={barcode})")
+            product_extras=session.query(EntryDataExtras).filter(EntryDataExtras.EntryId==product.EntryId)
+            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:
+                product_extras=product_extras.order_by(EntryDataExtras.doe.asc())
+            else:
+                product_extras=product_extras.order_by(EntryDataExtras.doe.desc())
+            extras=product_extras.all()
+            while True:
+                ct=len(extras)
+                lines=[]
+                for num,i in enumerate(extras):
+                    lines.append(self.colorize(f"{i.field_name}[{i.field_type}] = {i.field_value} {Fore.grey_70}#created on {i.doe}",num,ct))
+                helpText='\n'.join(lines)
+                print(helpText)
+                which=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Which index(es) do you wish to edit?",helpText=helpText,data="list")
+                if which in [None,]:
+                    return
+                elif isinstance(which,list):
+                    for i in which:
+                        try:
+                            index=int(i)
+                            if index in [i for i in range(len(extras))]:
+                                extra=extras[index]
+                                excludes=["doe","EntryId","ede_id","field_name","field_type"]
+                                pth=f"{Fore.light_yellow}Editing {Fore.light_red}{extra.field_name}[{Fore.light_steel_blue}{extra.field_type}{Fore.light_red}]{Style.reset}"
+                                print(pth)
+                                data={i.name:{"default":getattr(extra,i.name),"type":str(i.type).lower()} for i in extra.__table__.columns if i.name not in excludes}
+                                fd=FormBuilder(data=data,passThruText=pth)
+                                if fd is None:
+                                    print("User Chose to completely cancel!")
+                                    return
+                                toUpd8=session.query(EntryDataExtras).filter(EntryDataExtras.ede_id==extra.ede_id).update(fd)
+                                session.commit()
+                                session.refresh(extra)
+                                print(extra)
+                            else:
+                                print(f"Unknown Index('{index}')")
+                        except Exception as e:
+                            print(e)
+                else:
+                    continue
+                break
 
     def sf2e(self,barcode=None):
         with Session(ENGINE) as session:
@@ -1385,7 +1463,12 @@ field_value={Fore.light_steel_blue}{field.field_value}{Fore.light_cyan},
             'cmds':['edee','ensure_extras_field_exists'],
             'exec':self.edee,
             'desc':'ensures last used field is applied to all Entry\'s [SLOW!!!]',
-            }
+            },
+            'edit selected extra':{
+                'cmds':"edit selected extra from entry,esxfe".split(","),
+                'exec':self.edit_extra_field_from_entry,
+                'desc':'edit a selected EntryDataExtra from Entry Selection'
+            },
         })
         '''
 elif doWhat.lower() in "sch f2e,ssf2e".split(","):

{radboy-0.0.373 → radboy-0.0.375}/radboy/FB/FormBuilder.py

@@ -13,7 +13,9 @@ from datetime import date,time,datetime
 from radboy.FB.FBMTXT import *
 
 
-def FormBuilder(data,extra_tooling=False):
+def FormBuilder(data,extra_tooling=False,passThruText=None):
+    if passThruText != None:
+        passThruText=f"{Fore.light_green}{passThruText}: {Fore.light_yellow}"
     GOTOK=None
     def keys_index(data):
         for num,k in enumerate(data.keys()):
@@ -103,7 +105,7 @@ def FormBuilder(data,extra_tooling=False):
                         lines=[]
                         skip_review=False
                         while True:
-                            line=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"You(m):{item.get(k)}|Default(d):{data[k]['default']} Field:{str(k)}",helpText=f'{ht}\nuse {Fore.light_red}{Style.bold}{Back.grey_50}#done#{Style.reset} to stop.',data=data[k]['type'][:-1])
+                            line=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}You(m):{item.get(k)}|Default(d):{data[k]['default']} Field:{str(k)}",helpText=f'{ht}\nuse {Fore.light_red}{Style.bold}{Back.grey_50}#done#{Style.reset} to stop.',data=data[k]['type'][:-1])
                             if line in [None,]:
                                 return
                             elif line.lower() in ['#done#',]:
@@ -168,7 +170,7 @@ def FormBuilder(data,extra_tooling=False):
                             lines.append(line)
                         cmd='\n'.join(lines)
                         if not skip_review:
-                            use=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{cmd}\nUse? [y/n]",helpText="type something that can be represented as a boolean, this includes boolean formulas used in if/if-then statements(True=y/1/t/true/yes/1==1,False=n/no/0/f/false/1==0)",data="boolean")
+                            use=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}{cmd}\nUse? [y/n]",helpText="type something that can be represented as a boolean, this includes boolean formulas used in if/if-then statements(True=y/1/t/true/yes/1==1,False=n/no/0/f/false/1==0)",data="boolean")
                             if use in [None,]:
                                 return
                             elif use:
@@ -179,7 +181,7 @@ def FormBuilder(data,extra_tooling=False):
                                 continue
                 else:
                     passThru=['gotoi','goto i','gotok','goto k','showkeys','show keys']
-                    cmd=Prompt.__init2__(None,func=lambda text,data:FormBuilderMkText(text,data,passThru=passThru),ptext=f"You(m):{item.get(k)}|Default(d):{data[k]['default']} Field:{str(k)}",helpText=f'{ht}',data=data[k]['type'])
+                    cmd=Prompt.__init2__(None,func=lambda text,data:FormBuilderMkText(text,data,passThru=passThru),ptext=f"{passThruText} You(m):{item.get(k)}|Default(d):{data[k]['default']} Field:{str(k)}",helpText=f'{ht}',data=data[k]['type'])
                     if cmd in [None,]:
                         return
                     elif isinstance(cmd,list) and [i.lower() for i in cmd] in [['gotoi',],['goto i']]:
@@ -226,7 +228,7 @@ def FormBuilder(data,extra_tooling=False):
                         item[k]=cmd
                 else:
                     item[k]=cmd
-        review=Prompt.__init2__(None,func=FormBuilderMkText,ptext="review?",helpText="",data="bool")
+        review=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}review?",helpText="",data="bool")
         #print(review)
         if review in ['f',]:
             review=False
@@ -242,14 +244,14 @@ def FormBuilder(data,extra_tooling=False):
         #ask if extra data is needed
         count=len(tmp_item)
         while True:
-            nkv=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"New Key:Value Pair",helpText="yes or no",data="boolean")
+            nkv=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}New Key:Value Pair",helpText="yes or no",data="boolean")
             if nkv in ['d',True]:
-                key=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"default[{count}] Key",helpText="yes or no",data="string")
+                key=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}default[{count}] Key",helpText="yes or no",data="string")
                 if key in [None,]:
                     continue
                 elif key in ['d',]:
                     key=str(count)
-                value=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Value",helpText="data text",data="string")
+                value=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}Value",helpText="data text",data="string")
                 if value in [None,]:
                     continue
                 tmp_item[key]=value
@@ -259,7 +261,7 @@ def FormBuilder(data,extra_tooling=False):
         #loop through lines for removal
         final_result={}
         for k in tmp_item:
-            keep=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"['{tmp_item[k]}'] keep?",helpText="yes or no",data="boolean")
+            keep=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}['{tmp_item[k]}'] keep?",helpText="yes or no",data="boolean")
             if keep in ['d',True]:    
                 final_result[k]=tmp_item[k]
         return final_result

radboy-0.0.375/radboy/__init__.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.373
+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.373 → 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.373"
+VERSION="0.0.375"
 long_description=Path('README.md')
 if long_description.exists():
   long_description=long_description.open("r").read()

radboy-0.0.373/STDOUT.TXT

@@ -1,48 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"fcmd"
-#USER INPUT# -> :"compare"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"7.29"
-#USER INPUT# -> :"0.523"
-#USER INPUT# -> :"1.89"
-#USER INPUT# -> :"1"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"dlu"
-#USER INPUT# -> :"compare"
-#USER INPUT# -> :"7.29"
-#USER INPUT# -> :"0.523"
-#USER INPUT# -> :"1.89"
-#USER INPUT# -> :"1"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"dlu"
-#USER INPUT# -> :"compare"
-#USER INPUT# -> :"7.29"
-#USER INPUT# -> :"0.523"
-#USER INPUT# -> :"1.89"
-#USER INPUT# -> :"1"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.370"
-#USER INPUT# -> :"0.0.371"
-#USER INPUT# -> :"0.0.372"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"eaxpf"
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"la-xpf"
-#USER INPUT# -> :"laxpf"
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"la-xp"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.373"

radboy-0.0.373/radboy/__init__.py

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