radboy 0.0.638__tar.gz → 0.0.640__tar.gz

{radboy-0.0.638 → radboy-0.0.640}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.638
+Version: 0.0.640
 Summary: A Retail Calculator for Android/Linux
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

radboy-0.0.640/STDOUT.TXT

@@ -0,0 +1,15 @@
+#USER INPUT# -> :"dl"
+#USER INPUT# -> :"cr"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"today"
+#USER INPUT# -> :"now"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.639"
+#USER INPUT# -> :"0.0.640"

{radboy-0.0.638 → radboy-0.0.640}/pyproject.toml

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

{radboy-0.0.638 → radboy-0.0.640}/radboy/DayLog/DayLogger.py

@@ -1077,7 +1077,7 @@ fxtbl - update table with correct columns
                     if orderByTotalValue:
                         query=self.f_orderByTotalValue(query)
                     query=query.all()
-                
+            
             totals=OrderedDict({})
             totals_dl=OrderedDict({})
             total_price=OrderedDict({})
@@ -1093,19 +1093,26 @@ fxtbl - update table with correct columns
             for num,i in enumerate(query):
                 print(num,len(query))
                 if num >= len(query):
+                    
                     break
+
                 try:
+                    #print(num,i,'#HERE1')
                     if i.EntryId not in totals:
+                        #print(num,'#HERE1.1')
                         #total from fields not occurances
                         totals[i.EntryId]=decc(0,cf=ROUNDTO)
-                        totals_dl[i.EntryId]=decc(i,cf=ROUNDTO)
-                        
+                        #print(num,'#HERE1.2')
+                        totals_dl[i.EntryId]=i
+                        #print(num,'#HERE2')
                         total_crv[i.EntryId]=decc(i.CRV)*decc(0,cf=ROUNDTO)
+                        #print(num,'#HERE2.1')
                         total_tax[i.EntryId]=decc(i.Tax)*decc(0,cf=ROUNDTO)
+                        #print(num,'#HERE2.2')
                         total_price[i.EntryId]=decc(i.Price)*decc(0,cf=ROUNDTO)
+                        #print(num,'#HERE3')
                     for x in fields_for_total:
                         try:
-                            
                             totals[i.EntryId]+=decc(getattr(i,x),cf=ROUNDTO)
                             crv=decc(i.CRV*getattr(i,x),cf=ROUNDTO)
                             tax=decc(i.Tax*getattr(i,x),cf=ROUNDTO)
@@ -1132,6 +1139,8 @@ fxtbl - update table with correct columns
                             print(ee,repr(ee),x,i.seeShort())
                 except Exception as e:
                     print(e,repr(e),num,i,len(query))
+                    #exit(repr(e))
+                    print(i)
                     break
                 #next2=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{i}\n{Fore.light_magenta}Final Total:{Fore.light_steel_blue}{totals[i.EntryId]}{Style.reset} next?",helpText="yes or no(f will result in yes for str reasons)",data="boolean")
                 #if next2 in [None,]:
@@ -1141,6 +1150,7 @@ fxtbl - update table with correct columns
                 #else:
                 #    pass
         #
+        print('HERE4')
         if orderByTotalValue:
             totals_ordered_keys=OrderedDict({})
             for key in totals:
@@ -1152,7 +1162,7 @@ fxtbl - update table with correct columns
             for key in totals_ordered_keys.keys():
                 tmp[key]=totals[key]
             totals=tmp
-
+        #print('HERE5')
         totals_len=len(totals)
         for num,key in enumerate(totals):
             if LookUpState == True:
@@ -1166,10 +1176,16 @@ fxtbl - update table with correct columns
                         counter+=1
                 if counter >= len(fields_for_total):
                     continue
-                msg=f"{Fore.orange_red_1}{round(((total_crv[key]+total_tax[key]+total_price[key])/total_expense)*100,ROUNDTO)}% of {round(total_expense,ROUNDTO)} ** {Fore.light_cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{totals_len}{Fore.light_sea_green} '{dl.Name}' = {Fore.grey_70}{round(totals[key],ROUNDTO)} acquired,{Fore.dark_goldenrod} From {date_from} {Fore.dark_green}To {date_to},{Fore.spring_green_3a}for a period of {date_to-date_from},{Fore.medium_violet_red} for a total cost of {round(total_crv[key]+total_tax[key]+total_price[key],ROUNDTO)} [{Fore.light_steel_blue}DayLogId({Fore.green_yellow}{dl.DayLogId}{Fore.light_steel_blue}),{Fore.cadet_blue_1}EntryId({Fore.light_sea_green}{dl.EntryId}{Fore.cadet_blue_1}){Fore.medium_violet_red}].{Style.reset}\n"
+                print('HERE6')
+                print(decc(total_crv[key],cf=ROUNDTO),decc(total_tax[key],cf=ROUNDTO),decc(total_price[key],cf=ROUNDTO),decc(total_expense,cf=ROUNDTO))
+                try:
+                    msg=f"{Fore.orange_red_1}{decc((decc(total_crv[key],cf=ROUNDTO)+decc(total_tax[key],cf=ROUNDTO)+decc(total_price[key])),cf=ROUNDTO)/decc(total_expense*100,cf=ROUNDTO)}% of {decc(total_expense,cf=ROUNDTO)} ** {Fore.light_cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{totals_len}{Fore.light_sea_green} '{dl.Name}' = {Fore.grey_70}{decc(totals[key],cf=ROUNDTO)} acquired,{Fore.dark_goldenrod} From {date_from} {Fore.dark_green}To {date_to},{Fore.spring_green_3a}for a period of {date_to-date_from},{Fore.medium_violet_red} for a total cost of {decc(total_crv[key]+total_tax[key]+total_price[key],cf=ROUNDTO)} [{Fore.light_steel_blue}DayLogId({Fore.green_yellow}{dl.DayLogId}{Fore.light_steel_blue}),{Fore.cadet_blue_1}EntryId({Fore.light_sea_green}{dl.EntryId}{Fore.cadet_blue_1}){Fore.medium_violet_red}].{Style.reset}\n"
+                except Exception as e:
+                    msg=f"{Fore.orange_red_1}0% of {decc(total_expense,cf=ROUNDTO)} ** {Fore.light_cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{totals_len}{Fore.light_sea_green} '{dl.Name}' = {Fore.grey_70}{decc(totals[key],cf=ROUNDTO)} acquired,{Fore.dark_goldenrod} From {date_from} {Fore.dark_green}To {date_to},{Fore.spring_green_3a}for a period of {date_to-date_from},{Fore.medium_violet_red} for a total cost of {decc(total_crv[key]+total_tax[key]+total_price[key],cf=ROUNDTO)} [{Fore.light_steel_blue}DayLogId({Fore.green_yellow}{dl.DayLogId}{Fore.light_steel_blue}),{Fore.cadet_blue_1}EntryId({Fore.light_sea_green}{dl.EntryId}{Fore.cadet_blue_1}){Fore.medium_violet_red}].{Style.reset}\n"
                 if export:
                     logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=text_cr_export)
                 print(msg)
+                print('HERE7')
         ex=f"{Fore.light_red}Duration:{Fore.light_steel_blue}{datetime.now()-local_start}|{Fore.light_cyan}OrderByFinalValue[{Fore.deep_pink_4c}{orderByTotalValue}{Fore.light_cyan}]|GraphIt[{Fore.deep_pink_4c}{graph_it}{Fore.light_cyan}]|Export[{Fore.deep_pink_4c}{export}{Fore.light_cyan}]"
         if orderByTotalValue:
             reverse_state={False:'False - Desc. (First Line Oldest/Biggest,Last Line Newest/Smallest)',True:'True - Asc. (Firt Line Newest/Smallest,Last Line Newest/Biggest)'}

radboy-0.0.640/radboy/__init__.py

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

{radboy-0.0.638 → radboy-0.0.640}/radboy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.638
+Version: 0.0.640
 Summary: A Retail Calculator for Android/Linux
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

{radboy-0.0.638 → radboy-0.0.640}/setup.py

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

radboy-0.0.638/STDOUT.TXT

@@ -1,11 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"bld"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.637"
-#USER INPUT# -> :"0.0.638"

radboy-0.0.638/radboy/__init__.py

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