radboy 0.0.586__tar.gz → 0.0.588__tar.gz

{radboy-0.0.586 → radboy-0.0.588}/PKG-INFO

@@ -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.588/STDOUT.TXT

@@ -0,0 +1,23 @@
+#USER INPUT# -> :"hl"
+#USER INPUT# -> :"alai"
+#USER INPUT# -> :" "
+#USER INPUT# -> :"ff"
+#USER INPUT# -> :"del"
+#USER INPUT# -> :"1603"
+#USER INPUT# -> :"alai"
+#USER INPUT# -> :"toujeo"
+#USER INPUT# -> :"10"
+#USER INPUT# -> :"ff"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"del"
+#USER INPUT# -> :"1603"
+#USER INPUT# -> :"asai"
+#USER INPUT# -> :"lllll"
+#USER INPUT# -> :"ff"
+#USER INPUT# -> :"del"
+#USER INPUT# -> :"1603"
+#USER INPUT# -> :"f"
+#USER INPUT# -> :"f"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"0.0.588"

{radboy-0.0.586 → radboy-0.0.588}/pyproject.toml

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

{radboy-0.0.586 → radboy-0.0.588}/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-0.0.586 → radboy-0.0.588}/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-0.0.586 → radboy-0.0.588}/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-0.0.588/radboy/__init__.py

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

{radboy-0.0.586 → radboy-0.0.588}/radboy.egg-info/PKG-INFO

@@ -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 → radboy-0.0.588}/setup.py

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

radboy-0.0.586/STDOUT.TXT

@@ -1,9 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"bld sa"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.586"

radboy-0.0.586/radboy/__init__.py

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