radboy 0.0.423__tar.gz → 0.0.425__tar.gz

{radboy-0.0.423 → radboy-0.0.425}/PKG-INFO

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

radboy-0.0.425/STDOUT.TXT

@@ -0,0 +1,9 @@
+#USER INPUT# -> :"hl"
+#USER INPUT# -> :"lsbs"
+#USER INPUT# -> :"rllo"
+#USER INPUT# -> :"lsbs"
+#USER INPUT# -> :"rllo"
+#USER INPUT# -> :"lsbs"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.425"

{radboy-0.0.423 → radboy-0.0.425}/pyproject.toml

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

{radboy-0.0.423 → radboy-0.0.425}/radboy/DB/Prompt.py

@@ -31,6 +31,16 @@ import biip
 import radboy.Orders.MilkWaterOrder as MWR
 import itertools
 
+def orderQuery(query,orderBy):
+    LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
+    if not isinstance(LookUpState,bool):
+        LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=True,literal=False)
+    if LookUpState == True:
+        query=query.order_by(orderBy.asc())
+    else:
+        query=query.order_by(orderBy.desc())
+    return query
+
 def generate_cmds(startcmd,endCmd):
     cmd=(startcmd,endCmd)
     cmds=[]
@@ -988,7 +998,7 @@ class Prompt(object):
                     #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({round(total,ROUNDTO)}){Fore.slate_blue_1}
+{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}

{radboy-0.0.423 → radboy-0.0.425}/radboy/HealthLog/HealthLog.py

@@ -58,17 +58,23 @@ class HealthLogUi:
 			entry=None
 			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: ",helpText="what was consumed?",data="string")
+				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,]:
 					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))).all()
+							entry=session.query(Entry).filter(or_(Entry.Barcode==barcode,Entry.Barcode.icontains(barcode),Entry.Name.icontains(barcode),Entry.Code==barcode,Entry.Code.icontains(barcode)))
+
+							entry=orderQuery(entry,Entry.Timestamp)
+							entry=entry.all()
 							ct=len(entry)
-							if ct >= 0:
+							if ct > 0:
+								htext=[]
 								for num, i in enumerate(entry):
 									msg=f"{Fore.light_red}{num}/{Fore.medium_violet_red}{num+1} of {Fore.light_sea_green}{ct} -> {i.seeShort()}"
+									htext.append(msg)
 									print(msg)
-								which=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Which {Fore.light_red}index?{Fore.light_yellow}",helpText=f"{Fore.light_red}number{Fore.light_yellow} farthest to left of screen{Style.reset}",data="integer")
+								htext='\n'.join(htext)
+								which=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Which {Fore.light_red}index?{Fore.light_yellow}",helpText=f"{htext}\n{Fore.light_red}number{Fore.light_yellow} farthest to left of screen{Style.reset}",data="integer")
 								if which not in [None,]:
 									excludes.extend(["EntryBarcode","EntryName","EntryId"])
 									if which == 'd':
@@ -76,8 +82,26 @@ class HealthLogUi:
 									else:
 										entry=entry[which]
 								else:
-									entry=None
+									htext=f"{Fore.orange_red_1}No Results for '{Fore.cyan}{barcode}{Fore.orange_red_1}'{Style.reset}"
+									again=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Try another search?[yes/no=default]",helpText=htext,data="boolean")
+									if again is None:
+										return
+									elif again in [False,'d']:
+										entry=None
+										break
+									else:
+										barcode=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{h}Barcode|Code|Name[b=skips search]: ",helpText="what was consumed?",data="string")
+										continue
+									
+							else:
+								htext=f"{Fore.orange_red_1}No Results for '{Fore.cyan}{barcode}{Fore.orange_red_1}'{Style.reset}"
+								again=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Try another search?[yes/no=default]",helpText=htext,data="boolean")
+								if again is None:
+									return
+								elif again in [False,'d']:
 									break
+								else:
+									continue
 							break
 						except Exception as e:
 							print(e)
@@ -184,7 +208,9 @@ class HealthLogUi:
 	def showAll(self):
 		try:
 			with Session(ENGINE) as session:
-				results=session.query(HealthLog).order_by(HealthLog.DTOE.asc()).all()
+				results=session.query(HealthLog)
+				results=orderQuery(results,HealthLog.DTOE)
+				results=results.all()
 				ct=len(results)
 				for num,i in enumerate(results):
 					view=[]
@@ -200,6 +226,7 @@ class HealthLogUi:
 		output=Path("HealthLogAll.xlsx")
 		with Session(ENGINE) as session:
 			query=session.query(HealthLog)
+			query=orderQuery(query,HealthLog.DTOE)
 			df=pd.read_sql(query.statement,session.bind)
 			df.to_excel(output,index=False)
 			print(output.absolute())
@@ -213,6 +240,7 @@ class HealthLogUi:
 		not_none=[i for i in HealthLog.__table__.columns if str(i.name) in not_none]
 		with Session(ENGINE) as session:
 			query=session.query(HealthLog).filter(or_(*[i!=None for i in not_none]))
+			query=orderQuery(query,HealthLog.DTOE)
 			df=pd.read_sql(query.statement,session.bind)
 			df=df[fields]
 			df.to_excel(output,index=False)
@@ -229,7 +257,9 @@ class HealthLogUi:
 			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])).order_by(HealthLog.DTOE.asc()).all()
+				results=session.query(HealthLog).filter(or_(*[i!=None for i in not_none]))
+				results=orderQuery(results,HealthLog.DTOE)
+				results=results.all()
 				ct=len(results)
 				for num,i in enumerate(results):
 					view=[]
@@ -301,7 +331,7 @@ class HealthLogUi:
 			},
 			'add consumed':{
 				'cmds':['afd','add fd','add food','adfd','add fuel','ad fl','afl'],
-				'desc':'Create a NEW HealthLog for JUST Weight',
+				'desc':'Create a NEW HealthLog for JUST food',
 				'exec':lambda self=self:self.add_healthlog_specific(
 					useColumns=["EntryBarcode",
 								"EntryName",

radboy-0.0.425/radboy/__init__.py

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

{radboy-0.0.423 → radboy-0.0.425}/radboy.egg-info/PKG-INFO

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

{radboy-0.0.423 → radboy-0.0.425}/setup.py

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

radboy-0.0.423/STDOUT.TXT

@@ -1,184 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"eaxpfs"
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"eaxpf"
-#USER INPUT# -> :"laaf"
-#USER INPUT# -> :"mksl"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"test"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"qc"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"cf2e"
-#USER INPUT# -> :""
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"reproduct"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"cf2e"
-#USER INPUT# -> :"test"
-#USER INPUT# -> :"60"
-#USER INPUT# -> :"p65"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"mksl"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"test"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"qc"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"cf2e"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"p65"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"ssf2e"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"p65"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"mksl"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"test"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"qc"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"cf2e"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"p65"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"mksl"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"test"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"qc"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"sf2e"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"ssf2e"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"comment"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"mksl"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"test"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"qc"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"ssf2e"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"comment"
-#USER INPUT# -> :""
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"ssf2e"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"water"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"12"
-#USER INPUT# -> :"y"
-#USER INPUT# -> :"water"
-#USER INPUT# -> :"11"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"11"
-#USER INPUT# -> :"y"
-#USER INPUT# -> :"11"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"lu"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"ssf2e"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"water"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"cf2e"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"water"
-#USER INPUT# -> :"2"
-#USER INPUT# -> :"lu"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.422"
-#USER INPUT# -> :"mksl"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"set"
-#USER INPUT# -> :"y"
-#USER INPUT# -> :"-1"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"test"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"set"
-#USER INPUT# -> :"2"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"qc"
-#USER INPUT# -> :"set"
-#USER INPUT# -> :"2"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"1.84"
-#USER INPUT# -> :"y"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"mksl"
-#USER INPUT# -> :"test"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"test"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"qc"
-#USER INPUT# -> :"set"
-#USER INPUT# -> :"2"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"1.84"
-#USER INPUT# -> :"y"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"set"
-#USER INPUT# -> :"2"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"1.84"
-#USER INPUT# -> :"y"
-#USER INPUT# -> :"0.0875"
-#USER INPUT# -> :"lu"
-#USER INPUT# -> :""
-#USER INPUT# -> :"esu"
-#USER INPUT# -> :"sas"
-#USER INPUT# -> :"test"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.423"

radboy-0.0.423/radboy/__init__.py

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