radboy 0.0.638__py3-none-any.whl → 0.0.640__py3-none-any.whl

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

@@ -1 +1 @@
-VERSION='0.0.638'
+VERSION='0.0.640'

{radboy-0.0.638.dist-info → radboy-0.0.640.dist-info}/METADATA

@@ -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.dist-info → radboy-0.0.640.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=KI7Jmf3MX0Zng_YUvcjVKN2siyUOhaMAHQGzpPuX8KQ,41373
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=n8TslKcIKXEesQbLT9GM5IA9JHD-qBab5J8sFZdT6mg,17
+radboy/__init__.py,sha256=TPEsEXioz_EnfkX_PXoTgilL79vglBdghNc7ZcTACUI,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
@@ -139,7 +139,7 @@ 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=lCmx3zRpbN1u2TpOKgt3KY4vCEF0C1JbyGeogzPq8jE,102566
+radboy/DayLog/DayLogger.py,sha256=MMxOzAWE7whVCOqTlVwFZmw_SpP4agE0odpadERXjDY,103996
 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
@@ -147,7 +147,7 @@ radboy/DayLog/BhTrSa/__init__.py,sha256=q6xDsXAiWpQR2QWILKZKf--D3apR_KOE1CRbZaP7
 radboy/DayLog/BhTrSa/bhtrsaa.py,sha256=3ECYU_2yMNS_zsN0ZD6BbiIwbWcJ9mokUwOt_hkTAYs,18233
 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=hU_gGXyb802t5kR6AELpA7Ix2juDgbnNytaDrLalGnA,151894
+radboy/DayLog/__pycache__/DayLogger.cpython-313.pyc,sha256=_Ds7pmkSzbaE_mU6tjEt71_l7pxjT9pjrtlTsIQQVRM,154611
 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
@@ -401,7 +401,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=g3LrhF6Tm1oaTGn_mH6jlXwr_PCJD0tB6XRjCbwRW6M,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=n8vOTpF6A483FGq3fURy8jHi963U31MUctiAA4cLcVQ,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
@@ -429,7 +429,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.638.dist-info/METADATA,sha256=iJ1rebjVbuU0eBA-tRmjXGcQwIx6ozZV35r2hJtN43s,1891
-radboy-0.0.638.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.638.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.638.dist-info/RECORD,,
+radboy-0.0.640.dist-info/METADATA,sha256=FUndog67eQaUgzzkj0p-SbOSj-tNRaF3w1TfYP7-3_E,1891
+radboy-0.0.640.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.640.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.640.dist-info/RECORD,,