radboy 0.0.586__py3-none-any.whl → 0.0.588__py3-none-any.whl

radboy/DB/Prompt.py

@@ -1083,6 +1083,20 @@ class Prompt(object):
                             or_(db.Entry.CRV==None,db.Entry.CRV==0),
                             )
                             )
+                    elif db.BooleanAnswers.setFieldInList_MODES[mode] =='CRV_UNTAXED':
+                        results_query=results_query.filter(
+                            and_(
+                            or_(db.Entry.Tax==None,db.Entry.Tax==0),
+                            not_(or_(db.Entry.CRV==None,db.Entry.CRV==0)),
+                            )
+                            )
+                    elif db.BooleanAnswers.setFieldInList_MODES[mode] =='NO_CRV_TAXED':
+                        results_query=results_query.filter(
+                            and_(
+                            not_(or_(db.Entry.Tax==None,db.Entry.Tax==0)),
+                            or_(db.Entry.CRV==None,db.Entry.CRV==0),
+                            )
+                            )
 
                     location_fields=["Shelf","BackRoom","Display_1","Display_2","Display_3","Display_4","Display_5","Display_6","ListQty","SBX_WTR_DSPLY","SBX_CHP_DSPLY","SBX_WTR_KLR","FLRL_CHP_DSPLY","FLRL_WTR_DSPLY","WD_DSPLY","CHKSTND_SPLY","Distress"]
                     z=Prompt.mkfield_list(None,location_fields)
@@ -2342,10 +2356,14 @@ CMD's are not final until ended with {Fore.magenta}{hw_delim}{Style.reset}""")
 {Fore.grey_70}**{Fore.light_green}s{Fore.light_red}bld{Fore.light_steel_blue} - search with barcode in all items with InList==True and has a location value above {Fore.light_red}0{Style.reset}
 {Fore.grey_70}**{Fore.light_green}"bldlse","builde","buildlse","build list export ","bld ls exp",'elsbld','export list build','exp ls bld','ebld'{Fore.light_steel_blue} - same as versions without export, but dumps list to {Path(Prompt.bld_file).absolute()}{Style.reset}
 {Fore.grey_70}**{Fore.light_green}'esbld','export search build','export_search_build','exp scan build','exp_scan_bld'{Fore.light_steel_blue} - same as versions without export, but dumps list to {Path(Prompt.bld_file).absolute()}{Style.reset}
-{Fore.grey_70}**{Fore.light_green}"bldls crv","buildcrv","buildlscrv","build list crv","bld ls crv",'lsbld','list build crv','ls bld crv','bldcrv'{Fore.light_steel_blue} - bldls but on display Entries 'CRV' where has been applied.{Style.reset}
-{Fore.grey_70}**{Fore.light_green}"bldls tax","buildtax","buildlstax","build list tax","bld ls tx",'lsbldtx','list build tax','ls bld tx','bldtx'{Fore.light_steel_blue} - bldls but on display Entries 'Tax' where has been applied.{Style.reset}
-{Fore.grey_70}**{Fore.light_green}"bldls no txcrv","build no tax crv","buildlsnotaxcrv","build list no tax crv","bld ls ntxcrv",'lsbldntxcrv','list build no tax crv','ls bld ntx crv','bldntxcrv'{Fore.light_steel_blue} - bldls but on display Entries where no tax and no crv has been applied{Style.reset}
+
+{Fore.grey_70}**{Fore.light_green}{','.join(generate_cmds(startcmd=["lsbld","buildls","bldls","bld"],endCmd=["ncrvtxd","nocrv txd","ncrv txd","no crv taxed"]))}{Fore.light_steel_blue} - bldls but displays Entries where 'Tax' has been applied, but no CRV has been applied.{Style.reset}
+{Fore.grey_70}**{Fore.light_green}{','.join(generate_cmds(startcmd=["lsbld","buildls","bldls","bld"],endCmd=["crvntx","crv ntx","crv notax","crv not taxed","crv untaxed"]))}{Fore.light_steel_blue} - bldls but displays Entries where 'CRV' has been applied and where there is No tax.{Style.reset}
+{Fore.grey_70}**{Fore.light_green}"bldls no txcrv","build no tax crv","buildlsnotaxcrv","build list no tax crv","bld ls ntxcrv",'lsbldntxcrv','list build no tax crv','ls bld ntx crv','bldntxcrv'{Fore.light_steel_blue} - bldls but displays Entries where no tax and no crv has been applied{Style.reset}
+{Fore.grey_70}**{Fore.light_green}"bldls crv","buildcrv","buildlscrv","build list crv","bld ls crv",'lsbld','list build crv','ls bld crv','bldcrv'{Fore.light_steel_blue} - bldls but displays Entries where 'CRV' where has been applied, regardless of taxed value.{Style.reset}
+{Fore.grey_70}**{Fore.light_green}"bldls tax","buildtax","buildlstax","build list tax","bld ls tx",'lsbldtx','list build tax','ls bld tx','bldtx'{Fore.light_steel_blue} - bldls but displays Entries 'Tax' where has been applied,regardless of crv value.{Style.reset}
 {Fore.grey_70}**{Fore.light_green}"bldls showall","build showall","buildlssa","build list sa","bld ls sa",'lsbldsa','list build showall','ls bld sa','bld sa'{Fore.light_steel_blue} - bldls skipping the mode prompt to list all{Style.reset}
+
 {Fore.orange_red_1}**{Fore.grey_50}Add a {Fore.light_magenta}-{Fore.grey_50} to the end of each cmd to include negatives, but ignore '0' and 'None' if spaces are included then put a space before the last -, elsewise put a it immediately behind the cmd to to enable this feature{Style.reset}
 {Fore.grey_70}**{Fore.light_green}es{Fore.light_red}u{Fore.light_steel_blue} - search entry menu{Style.reset}
 {Fore.grey_70}**{Fore.light_green}tv{Fore.light_red}u{Fore.light_steel_blue} - show tag data info{Style.reset}
@@ -2790,7 +2808,10 @@ which will result in a cmd of 'ls Shelf'{Style.reset}
                         bldls(mode=db.BooleanAnswers.setFieldInList_MODES.index('NO_CRV_NO_TAX'))                        
                     elif cmd.lower() in ["bldls showall","build showall","buildlssa","build list sa","bld ls sa",'lsbldsa','list build showall','ls bld sa','bld sa']:
                         bldls(mode=db.BooleanAnswers.setFieldInList_MODES.index('SHOWALL'))                        
-
+                    elif cmd.lower() in generate_cmds(startcmd=["lsbld","buildls","bldls","bld"],endCmd=["ncrvtxd","nocrv txd","ncrv txd","no crv taxed"]):
+                        bldls(mode=db.BooleanAnswers.setFieldInList_MODES.index('NO_CRV_TAXED'))  
+                    elif cmd.lower() in generate_cmds(startcmd=["lsbld","buildls","bldls","bld"],endCmd=["crvntx","crv ntx","crv notax","crv not taxed","crv untaxed"]):
+                        bldls(mode=db.BooleanAnswers.setFieldInList_MODES.index('CRV_UNTAXED'))  
                     elif cmd.lower() in ['si-reference','si-ref','si ref','si reference']:
                         msg=f"""{Fore.light_steel_blue}{Style.bold}
 Name    Symbol  Factor/Scientific   Name

radboy/DB/db.py

@@ -254,7 +254,7 @@ class BOOLEAN_ANSWERS:
         'UnitsDeep',
         'UnitsHigh',
         ]
-        self.setFieldInList_MODES=['SHOWALL','ONLY_SHOW_CRV','ONLY_SHOW_TAXED','NO_CRV_NO_TAX']
+        self.setFieldInList_MODES=['SHOWALL','ONLY_SHOW_CRV','ONLY_SHOW_TAXED','NO_CRV_NO_TAX','CRV_UNTAXED','NO_CRV_TAXED']
         self.HealthLogZip=Path("HealthLog.zip")
         self.IllegalCharsManifest=Path("IllegalCharsManifest.txt")
         self.yes=generate_cmds(startcmd=['y','Y','YES','1','t','true','TRUE','True'],endCmd=['',' '])

radboy/HealthLog/HealthLog.py

@@ -91,7 +91,7 @@ class HealthLogUi:
 			if 'EntryBarcode' in useColumns:
 				h=f'{Fore.light_red}HealthLog{Fore.light_yellow}@{Style.bold}{Fore.deep_sky_blue_3b}AHS{Fore.light_yellow} : '
 				barcode=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{h}Barcode|Code|Name[b=skips search]: ",helpText="what was consumed?",data="string")
-				if barcode not in [None,]:
+				if barcode not in [None,'d']:
 					while True:
 						try:
 							entry=session.query(Entry).filter(or_(Entry.Barcode==barcode,Entry.Barcode.icontains(barcode),Entry.Name.icontains(barcode),Entry.Code==barcode,Entry.Code.icontains(barcode)))
@@ -162,6 +162,9 @@ class HealthLogUi:
 				return
 			if 'LongActingInsulinName' in useColumns or 'ShortActingInsulinName' in useColumns:
 				def searchNames(code):
+					mp=[]
+					for im in string.printable:
+						mp.extend([f'{im}'*i for i in range(os.get_terminal_size().columns)])
 					if code is None:
 						if 'LongActingInsulinName' in useColumns:
 							return 'Long Acting Insuline Unspecificied - see comments'
@@ -169,6 +172,13 @@ class HealthLogUi:
 							return 'Short Acting Insulin Unspecificied - see comments'
 						else:
 							return 'see comments'
+					elif code in ['d','',*mp]:
+						if 'LongActingInsulinName' in useColumns:
+							return 'Long Acting Insuline Unspecificied - see comments'
+						elif 'ShortActingInsulinName' in useColumns:
+							return 'Short Acting Insulin Unspecificied - see comments'
+						else:
+							return 'see comments'
 					with Session(ENGINE) as session:
 						query=session.query(Entry)
 						filters=[

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.586'
+VERSION='0.0.588'

{radboy-0.0.586.dist-info → radboy-0.0.588.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.586
+Version: 0.0.588
 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.586.dist-info → radboy-0.0.588.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=rRi3SVbI9sJqhbKvSFK29JePZwE0BP5kMtM3tKc1Ih0,17
+radboy/__init__.py,sha256=_4Akr76xj8UPbZzqlvooYF_VVc8-S2L7kAqdiC4qdOc,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
@@ -86,14 +86,14 @@ radboy/DB/ExerciseTracker.py,sha256=OS9i8jGIZPj-6m1bB0-eKNHQ6vf2iv_AYPEc0s4bkBM,
 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=KtU3ueGyZvSiRpLt9Xp1rHiDpNhUGhvipwazeoLOgRo,170010
+radboy/DB/Prompt.py,sha256=JbPDqo51Zn3e2ed95BF1Mz3GXOf5QomCa_ADH5yGEEs,171935
 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
 radboy/DB/__init__.py,sha256=JiigA9B7GalP7YuRdcwyGDu5PDSBahoi0lLjtScxlN8,49
 radboy/DB/blankDataFile.py,sha256=YX_05Usi71UpDkZN9UTMYwUipbTndTAtEgqzBEga0kE,9285
 radboy/DB/config.py,sha256=bvu43dUl1_yO3Zq3gsLuenGUgJSiS3S9Cs6ppFEvZbg,239
-radboy/DB/db.py,sha256=W7XoGr4FPHO7y6LvRrYEhZ2XzhLYsIT5tTIrWnB1hQk,256321
+radboy/DB/db.py,sha256=sGgNf86X25U84OLrlXWwMx9zQbibzrUs4_r4u1OPPds,256350
 radboy/DB/glossary_db.py,sha256=1_qxeEpjjEtpWB_eDjsgJisimLv7OBm75MuqM-Lt6zg,28218
 radboy/DB/masterLookup.py,sha256=DBaM2uscG3_X5dek49wjdnOzhrjWhKgvOEz_umdz0mY,4566
 radboy/DB/msg.txt,sha256=YxWed6A6tuP1djJ5QPS2Rz3ING4TKKf8kUiCCPtzHXE,7937
@@ -110,7 +110,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=qJvEY9kiW_G5Jk2KwboOrz_7oD-Nt-k8VWSGJbvzXrg,253605
+radboy/DB/__pycache__/Prompt.cpython-313.pyc,sha256=EEoEbgxWDcbIQV0sw884TyGpzHItzTincTIkhPYGjvo,256438
 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
@@ -128,7 +128,7 @@ radboy/DB/__pycache__/config.cpython-312.pyc,sha256=Qo7E6MHrF6yqvKgepNFyCoekZXiv
 radboy/DB/__pycache__/config.cpython-313.pyc,sha256=_8wCIg_3jhyJjxnExD2Sm6aY-uZTw036p7Ki5znL7dc,376
 radboy/DB/__pycache__/db.cpython-311.pyc,sha256=rNgigyBd0D-cg1JxKAS8t0B_k0IEJivgVlRaZE10Xis,210105
 radboy/DB/__pycache__/db.cpython-312.pyc,sha256=ANDJPC0RoavbmSKFxG15vC7B4rEGyVt7xRJt7XGY3OA,334609
-radboy/DB/__pycache__/db.cpython-313.pyc,sha256=KCdcT-cFcyQrVBINOKZ8zZWvvwUM5CfOhCIaSYYAl4c,403633
+radboy/DB/__pycache__/db.cpython-313.pyc,sha256=w-wjzmezHXOQIAfaYpWy5X-1V_yoRnCoOyTSKWdAlB0,403660
 radboy/DB/__pycache__/glossary_db.cpython-312.pyc,sha256=8UL-29cKqtKovx0BANm6kzKKteef1BW_2qF3wumzst4,36023
 radboy/DB/__pycache__/glossary_db.cpython-313.pyc,sha256=Ke9bkvllGv5CK0JdT9DRvQ3MOdrXxoYv7TVLNkqLux0,36582
 radboy/DB/__pycache__/masterLookup.cpython-312.pyc,sha256=bQiOkmMwwHgcO18tYSWGQ-YUff4GQlKVhBMp1GoWAqY,6324
@@ -211,10 +211,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=D-L1RjE3xLNQx0XgeISWzOwpXMBD7zAWdr7TDpKUhGM,37086
+radboy/HealthLog/HealthLog.py,sha256=2RQxuqSV_fRPohAd5A2UenKwElpJ19XyWbnVl-mkZOg,37513
 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=im5mkOYoMf9V9CRbpb01_n0MEwI5kR4YbRJkAJV9qGk,58010
+radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=Y8zL1bsKODV08MB265tVDQ0hfc1ZB2cr0dCcf7PKO0M,58477
 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
@@ -399,7 +399,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=jD85hZ869gcTOpsqQzcFHwkaI6QU0rZooj6D1uX0kdc,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=d1LbrvcWWdl7bWQLYN1Cr9f4XBYtpte8f3QKXR-39EM,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
@@ -427,7 +427,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.586.dist-info/METADATA,sha256=M2CFzo7oobsDyN3aT-JcBdjba3OY7TieyoFRkb15jgQ,1662
-radboy-0.0.586.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.586.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.586.dist-info/RECORD,,
+radboy-0.0.588.dist-info/METADATA,sha256=VkrLzTGhHNH9i3WpvHcZRdIXolv89c5nzl_69DMca7A,1662
+radboy-0.0.588.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.588.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.588.dist-info/RECORD,,