radboy 0.0.508__py3-none-any.whl → 0.0.510__py3-none-any.whl

radboy/DB/Prompt.py

@@ -993,10 +993,10 @@ class Prompt(object):
                         return
                     #start
                     ROUNDTO=int(db.detectGetOrSet("lsbld ROUNDTO default",3,setValue=False,literal=True))
-                    master_total=Decimal("0.00")
+                    master_total=Decimal("0.0000")
                     master_total_crv=Decimal("0.00")
-                    master_total_tax=Decimal("0.00")
-                    master_total_tax_crv=Decimal("0.00")
+                    master_total_tax=Decimal("0.0000")
+                    master_total_tax_crv=Decimal("0.0000")
                     reRunRequired=False
                     for num,i in enumerate(results):
                         getExtras(i.EntryId,extras)
@@ -1021,13 +1021,13 @@ class Prompt(object):
                         Fore.orange_3,
                         ]
                         #print("#0")
-                        total=Decimal("0.00")
-                        crv=Decimal("0.00")
+                        total=Decimal("0.0000")
+                        crv=Decimal("0.0000")
                         tax=Decimal("0.0000")
-                        tax_crv=Decimal("0.00")
+                        tax_crv=Decimal("0.0000")
                         i.Tax=Decimal(i.Tax).quantize(Decimal("0.0000"))
-                        i.CRV=Decimal(i.CRV).quantize(Decimal("0.00"))
-                        i.Price=Decimal(i.Price).quantize(Decimal("0.00"))
+                        i.CRV=Decimal(i.CRV).quantize(Decimal("0.0000"))
+                        i.Price=Decimal(i.Price).quantize(Decimal("0.0000"))
                         try:
                             if (i.Price+i.CRV) > 0:
                                 taxRate=Decimal(i.Tax/(i.Price+i.CRV)).quantize(Decimal("0.0000"))
@@ -1036,9 +1036,9 @@ class Prompt(object):
 
                         except Exception as e:
                             taxRate=Decimal('0.00000')
-                            i.Tax=Decimal('0.00')
-                            i.Price=Decimal('0.00')
-                            i.CRV=Decimal('0.00')
+                            i.Tax=Decimal('0.0000')
+                            i.Price=Decimal('0.0000')
+                            i.CRV=Decimal('0.0000')
                             session.commit()
                             session.refresh(i)
 
@@ -1047,12 +1047,12 @@ class Prompt(object):
                             for n2,f in enumerate(location_fields):
                                 try:
                                     if getattr(i,f) > 0:
-                                        total+=Decimal(getattr(i,f)).quantize(Decimal("0.00"))
+                                        total+=Decimal(getattr(i,f)).quantize(Decimal("0.0000"))
                                 except Exception as e:
                                     print(e)
                             for n2,f in enumerate(location_fields):
                                 if getattr(i,f) > 0:
-                                    msg2=f'{colormapped[n2]}{f} = {Decimal(getattr(i,f)).quantize(Decimal("0.00"))}{Style.reset}'
+                                    msg2=f'{colormapped[n2]}{f} = {Decimal(getattr(i,f)).quantize(Decimal("0.0000"))}{Style.reset}'
                                     if n2 < len(location_fields):
                                         msg2+=","
                                     msg+=msg2
@@ -1060,19 +1060,19 @@ class Prompt(object):
                             for n2,f in enumerate(location_fields):
                                 try:
                                     if getattr(i,f) != 0:
-                                        total+=Decimal(getattr(i,f)).quantize(Decimal("0.00"))
+                                        total+=Decimal(getattr(i,f)).quantize(Decimal("0.0000"))
                                 except Exception as e:
                                     print(e)
                             for n2,f in enumerate(location_fields):
                                 if getattr(i,f) != 0:
-                                    msg2=f'{colormapped[n2]}{f} = {Decimal(str(getattr(i,f))).quantize(Decimal("0.00"))}{Style.reset}'
+                                    msg2=f'{colormapped[n2]}{f} = {Decimal(str(getattr(i,f))).quantize(Decimal("0.0000"))}{Style.reset}'
                                     if n2 < len(location_fields):
                                         msg2+=","
                                     msg+=msg2
-                        master_total+=total*Decimal(i.Price).quantize(Decimal("0.00"))
+                        master_total+=total*Decimal(i.Price).quantize(Decimal("0.0000"))
 
-                        crv+=(Decimal(i.CRV).quantize(Decimal("0.00"))*total)
-                        tax+=(Decimal(i.Tax).quantize(Decimal("0.00"))*total)
+                        crv+=(Decimal(i.CRV).quantize(Decimal("0.0000"))*total)
+                        tax+=(Decimal(i.Tax).quantize(Decimal("0.0000"))*total)
 
                         tax_crv=(crv+tax)
                         master_total_tax+=tax
@@ -1084,34 +1084,34 @@ class Prompt(object):
                             #print(Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("00.00")),"s2")
                             #print(tax_crv,"s3")
                             #super_total=(round(round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO)/getSuperTotal(results,location_fields,colormapped)['final total'],ROUNDTO))*100
-                            if (total*Decimal(i.Price).quantize(Decimal("0.00"))+tax+crv) > 0:
-                                super_total=(total*Decimal(i.Price).quantize(Decimal("0.00"))+tax+crv)/Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("00.00"))
+                            if (total*Decimal(i.Price).quantize(Decimal("0.0000"))+tax+crv) > 0:
+                                super_total=(total*Decimal(i.Price).quantize(Decimal("0.0000"))+tax+crv)/Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("00.0000"))
                                 super_total=super_total*100
                             else:
                                 super_total=0
                         except Exception as e:
-                            p1=total*Decimal(i.Price).quantize(Decimal("0.00"))+tax_crv
-                            p2=Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("0.00"))
+                            p1=total*Decimal(i.Price).quantize(Decimal("0.0000"))+tax_crv
+                            p2=Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("0.0000"))
                             print(e)
                             print(p1,"p1")
                             print(p2,"p2")
                             super_total=0
                         #print("#exegen2")
-                        super_total=Decimal(super_total).quantize(Decimal("0.00"))
+                        super_total=Decimal(super_total).quantize(Decimal("0.0000"))
                         #print(super_total)
                         msg+=f"""{Fore.light_magenta} |-|{Fore.light_green} Total = {Fore.light_sea_green}{total}
-{Fore.light_magenta}Price({Decimal(i.Price).quantize(Decimal("0.00"))}){Fore.medium_violet_red}*{Fore.light_slate_blue}Total({total}):{Decimal(i.Price).quantize(Decimal("0.00"))*total}
-{Fore.grey_70}+CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({total.quantize(Decimal("0.00"))}){Fore.slate_blue_1}
- {Fore.medium_spring_green}= {Fore.slate_blue_1}TotalCRV({crv})+TotalPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))})
- {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+crv}){Style.reset}
-{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.00"))}) w/o CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({total}){Fore.slate_blue_1}
+{Fore.light_magenta}Price({Decimal(i.Price).quantize(Decimal("0.0000"))}){Fore.medium_violet_red}*{Fore.light_slate_blue}Total({total}):{Decimal(i.Price).quantize(Decimal("0.0000"))*total}
+{Fore.grey_70}+CRV({Decimal(i.CRV).quantize(Decimal("0.0000"))})*Total({total.quantize(Decimal("0.0000"))}){Fore.slate_blue_1}
+ {Fore.medium_spring_green}= {Fore.slate_blue_1}TotalCRV({crv})+TotalPrice({total*Decimal(i.Price).quantize(Decimal("0.0000"))})
+ {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price).quantize(Decimal("0.0000"))+crv}){Style.reset}
+{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.0000"))}) w/o CRV({Decimal(i.CRV).quantize(Decimal("0.0000"))})*Total({total}){Fore.slate_blue_1}
  {Fore.medium_spring_green}= {Fore.slate_blue_1}TaxNoCRVTotal({tax})+TotalPrice({total*i.Price})
- {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+tax}){Style.reset}
-{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.00"))}) w/ CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({total}){Fore.slate_blue_1}
+ {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price).quantize(Decimal("0.0000"))+tax}){Style.reset}
+{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.0000"))}) w/ CRV({Decimal(i.CRV).quantize(Decimal("0.0000"))})*Total({total}){Fore.slate_blue_1}
  {Fore.medium_spring_green}= {Fore.slate_blue_1}TaxCRVTotal({tax_crv})+TotalPrice({total*i.Price})
- {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+tax+crv}){Style.reset}
+ {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price).quantize(Decimal("0.0000"))+tax+crv}){Style.reset}
 {Fore.medium_violet_red}PercentOfTotal({super_total}%) of FinalTotal({getSuperTotal(results,location_fields,colormapped)['final total']})
-{Fore.orange_red_1}TaxRate({taxRate})={Decimal(taxRate*100).quantize(Decimal("0.00"))}%{Style.reset}
+{Fore.orange_red_1}TaxRate({taxRate})={Decimal(taxRate*100).quantize(Decimal("0.0000"))}%{Style.reset}
 {'*'*os.get_terminal_size().columns}{Style.reset}"""
                         if bldlse:
                             db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)
@@ -1134,10 +1134,10 @@ class Prompt(object):
                                 cse(i.Barcode)
                                 continue
 
-                    master_total=Decimal(str(master_total)).quantize(Decimal("0.00"))
-                    master_total_crv=Decimal(str(master_total_crv)).quantize(Decimal("0.00"))
-                    master_total_tax=Decimal(str(master_total_tax)).quantize(Decimal("0.00"))
-                    master_total_tax_crv=Decimal(str(master_total_tax_crv)).quantize(Decimal("0.00"))
+                    master_total=Decimal(str(master_total)).quantize(Decimal("0.0000"))
+                    master_total_crv=Decimal(str(master_total_crv)).quantize(Decimal("0.0000"))
+                    master_total_tax=Decimal(str(master_total_tax)).quantize(Decimal("0.0000"))
+                    master_total_tax_crv=Decimal(str(master_total_tax_crv)).quantize(Decimal("0.0000"))
 
                     actual=(master_total_crv+master_total)+master_total_tax
                     

radboy/HealthLog/HealthLog.py

@@ -417,12 +417,35 @@ class HealthLogUi:
 
 	def showAllField(self,fields=[],not_none=[]):
 		try:
+			useDateRange=Prompt.__init2__(None,func=FormBuilderMkText,ptext="use a date range?",helpText="yes or no",data="boolean")
+			if useDateRange is None:
+				return
+			elif useDateRange in ['d',]:
+				useDateRange=True
+
 			gf=fields
 			fields.extend(["DTOE","HLID","Comments"])
 			fields=[i for i in HealthLog.__table__.columns if str(i.name) in fields]
 			not_none=[i for i in HealthLog.__table__.columns if str(i.name) in not_none]
 			with Session(ENGINE) as session:
 				results=session.query(HealthLog).filter(or_(*[i!=None for i in not_none]))
+				if useDateRange:
+					default_sd=datetime.now()-timedelta(days=30)
+					start_date=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Start Date(default = {default_sd}):",helpText="start date",data="datetime")
+					if start_date is None:
+						return
+					elif start_date in ['d',]:
+						start_date=default_sd
+
+					default_ed=datetime.now()
+					end_date=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"End Date(default = {default_ed}):",helpText="end date",data="datetime")
+					if end_date is None:
+						return
+					elif end_date in ['d',]:
+						end_date=default_ed
+
+					results=results.filter(and_(HealthLog.DTOE>=start_date,HealthLog.DTOE<=end_date))
+
 				results=orderQuery(results,HealthLog.DTOE)
 				
 				graph_it=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Graph Results (if possible)[y/N]:",helpText="yes or no; default is No.",data="boolean")

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.508'
+VERSION='0.0.510'

{radboy-0.0.508.dist-info → radboy-0.0.510.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.508
+Version: 0.0.510
 Summary: A small example package
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

{radboy-0.0.508.dist-info → radboy-0.0.510.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=Lt2reA6xchq3U7Y08DvkrHboZ25i1ts7X2E9gSIwcVg,41101
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=afXrxabCItpWvt8KfGpyHWCCa35fETpkpjvNvhh3TMs,17
+radboy/__init__.py,sha256=EPMCmPfGHTq-kCE_LFdtM-NqPispByI4fjHVeBSZxq0,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
@@ -85,7 +85,7 @@ radboy/DB/ExerciseTracker.py,sha256=CZ8jdKJiAE_QTAiJTRXi8ZOnS1NUiSvWVSKLHLpYVGk,
 radboy/DB/PayDay.py,sha256=H2kPGvBCDkMOz7lbxQhYtUt_oAInpxi37Q6MFrah98I,8710
 radboy/DB/PayModels.py,sha256=hjwWxP7PL33hmfzQl5YTf0HqzaMxXJxFknPdxFJXJc8,3499
 radboy/DB/PrintLogging.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-radboy/DB/Prompt.py,sha256=7BcheKtc9z7Yzfiiy_K62lyQQeD0VHE7Z1FKVYjIf5s,148869
+radboy/DB/Prompt.py,sha256=Q0KWXkWDH1meNEASMRzZGhdLRLYNiuE4U7W75mYeEuo,148951
 radboy/DB/RandomStringUtil.py,sha256=eZCpR907WStgfbk4Evcghjv9hOkUDXH-iMXIq0-kXq8,24386
 radboy/DB/ResetTools.py,sha256=RbI-Ua7UlsN0S9qLqtEkTWvzyTZ6R-hHR3CW4NHlUPE,6660
 radboy/DB/SMLabelImporter.py,sha256=eUoBDxVUUEKGL2g_PwkASM67ZB7FmXtSnn4bCagskhY,4013
@@ -109,7 +109,7 @@ radboy/DB/__pycache__/FormBuilder.cpython-312.pyc,sha256=p1o-5SMRL8OXP_XQ5liUpf-
 radboy/DB/__pycache__/PrintLogging.cpython-312.pyc,sha256=pIAFqTi6OiQQORSc-oMH1zAbsdH7sY1TifxrN_QOvnU,148
 radboy/DB/__pycache__/Prompt.cpython-311.pyc,sha256=P2uPRpeqfLFtxieZ0JHBG3X_HZzWUCsFSLb_fpRqky0,6407
 radboy/DB/__pycache__/Prompt.cpython-312.pyc,sha256=6CcQ1gE2hcz3cKPjo4f6d7xNM2PTDnl8NzQG0Pme5BE,142886
-radboy/DB/__pycache__/Prompt.cpython-313.pyc,sha256=HDAZIy_-J_BbaUlOMrMrz510nAv6lvwZ_UXiO4pqrYA,225463
+radboy/DB/__pycache__/Prompt.cpython-313.pyc,sha256=OOjphTJL4QlfPMjT2RTN64o48ha7NE6-OU_YjJFQ5g8,225514
 radboy/DB/__pycache__/RandomStringUtil.cpython-312.pyc,sha256=TrbEY89MuLmNlvoo5d8vOE6Dyshh5_EMlTZvk8MDVN4,48597
 radboy/DB/__pycache__/RandomStringUtil.cpython-313.pyc,sha256=MCcgVwV2Y-9rAY2FVaJZCKcou3HDX70EZudoiCigT0o,49217
 radboy/DB/__pycache__/ResetTools.cpython-311.pyc,sha256=4Vyc57iAAF0yRPjjglnVKovnTn8OoFIi6Zok3Wpj_YM,9292
@@ -210,10 +210,10 @@ radboy/GeoTools/__pycache__/GeoClass.cpython-313.pyc,sha256=eZ6hpLKoic1XCb7BKKg-
 radboy/GeoTools/__pycache__/OSMClass.cpython-312.pyc,sha256=5RoT8_wiI8R7yb_B9FWIC7mALdGNoqyWtkzsjM2pbh0,40387
 radboy/GeoTools/__pycache__/__init__.cpython-312.pyc,sha256=Y7Xtrzwm44-xuY_4NK8aDjYfVmXIzUFWOyexJu9le8A,1238
 radboy/GeoTools/__pycache__/__init__.cpython-313.pyc,sha256=-bk9eEIxWZgHYZHtNJbrpubDRWkbdYNkGr5J7sVhyIE,1238
-radboy/HealthLog/HealthLog.py,sha256=9tCpmi6u7N1zSCGCTf1f5NxKl0ht-lvHmUSVqnk8zh4,26664
+radboy/HealthLog/HealthLog.py,sha256=2bj25RV5OnsctAnmNdWuczZywqSd2nFEofrqpqKIw-Q,27554
 radboy/HealthLog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/HealthLog/__pycache__/HealthLog.cpython-312.pyc,sha256=hTo4o7jo9L2yqPZgzuKUw_kon_PVcCuTRguELTuLrIo,27946
-radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=tAS1OoGfGi-opNhHAI5Nn5YhiMPScE3ZqNj-H1jJkvs,42836
+radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=ecA8q5T7_ysyMNJM2jkecZYQv2Q_UekX6lKDog3NFxQ,43896
 radboy/HealthLog/__pycache__/__init__.cpython-312.pyc,sha256=yZrYKBk31pGSjCRqmqzpX409iw-muC1zsNO2ObqkGlY,272
 radboy/HealthLog/__pycache__/__init__.cpython-313.pyc,sha256=cqdZbEJKq9XVoVqDAwsW0pwwBBGSerJNWGlST3YVR3g,151
 radboy/InListRestore/ILR.py,sha256=s8fbbHLKQSVJX1VaeyGE-vdIUGBEbOPX29kRIG2j2WY,16847
@@ -398,7 +398,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=73qv9n_btNsCM0JAX81_khRCC0knGviRcPwcE33pFPU,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=E6bV4QXYy2SvypYdE2UYh5oktF--wUKFcsMNUrkA8YU,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
@@ -423,7 +423,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.508.dist-info/METADATA,sha256=yKBbHsBM2K5JZ8P4JllOeUC7MVQU2ZL8CdrnmHkj9SU,1601
-radboy-0.0.508.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.508.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.508.dist-info/RECORD,,
+radboy-0.0.510.dist-info/METADATA,sha256=PGlfhXV-_ZV9gfiO1IpiR5dqHauO6EBZkvZFfTox724,1601
+radboy-0.0.510.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.510.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.510.dist-info/RECORD,,