radboy 0.0.438__tar.gz → 0.0.439__tar.gz

{radboy-0.0.438 → radboy-0.0.439}/PKG-INFO

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

radboy-0.0.439/STDOUT.TXT

@@ -0,0 +1,283 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"exp"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :""
+#USER INPUT# -> :"vllo"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :""
+#USER INPUT# -> :"rllo"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"exp"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :""
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :"rllo"
+#USER INPUT# -> :""
+#USER INPUT# -> :"rllo"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :""
+#USER INPUT# -> :"rllo"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :""
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"rllo"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.427"
+#USER INPUT# -> :"exp"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"exp"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"exp"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"exp"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :""
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"#b"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.428"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.429"
+#USER INPUT# -> :"0.0.430"
+#USER INPUT# -> :"0.0.431"
+#USER INPUT# -> :"0.0.431"
+#USER INPUT# -> :"0.0.431"
+#USER INPUT# -> :"0.0.431"
+#USER INPUT# -> :"0.0.432"
+#USER INPUT# -> :"0.0.432"
+#USER INPUT# -> :"0.0.432"
+#USER INPUT# -> :"0.0.433"
+#USER INPUT# -> :"0.0.434"
+#USER INPUT# -> :"0.0.435"
+#USER INPUT# -> :"0.0.436"
+#USER INPUT# -> :"0.0.437"
+#USER INPUT# -> :"0.0.438"
+#USER INPUT# -> :"exp"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :""
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :""
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :""
+#USER INPUT# -> :"f"
+#USER INPUT# -> :"f"
+#USER INPUT# -> :""
+#USER INPUT# -> :"re"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"#b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :""
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"6.26.28"
+#USER INPUT# -> :"f"
+#USER INPUT# -> :"f"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :""
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"exp"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :""
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"exp"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"exp"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"#b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"exp"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :""
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"exp"
+#USER INPUT# -> :"reb"
+#USER INPUT# -> :""
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"reb"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"819573017069"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"015000048754"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"reb"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"015000048754"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"exp"
+#USER INPUT# -> :"swa"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"015000048303"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"reb"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"015000048303"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"re"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"015000048303"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.439"

{radboy-0.0.438 → radboy-0.0.439}/pyproject.toml

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

{radboy-0.0.438 → radboy-0.0.439}/radboy/RNE/RNE.py

@@ -460,7 +460,7 @@ class Expiration:
 					except Exception as e:
 						print(e)
 
-	def search_expo(self,returnable=False,code=None,group=True):
+	def search_expo(self,returnable=False,code=None,group=True,past_due_only=False):
 		with Session(ENGINE) as session:
 			while True:
 				if code != None:
@@ -503,6 +503,13 @@ class Expiration:
 				else:
 					results=query.order_by(Expiry.DTOE.asc()).order_by(Expiry.BB_Expiry.asc())
 				
+				print(past_due_only)
+				#exit()
+				if past_due_only == True:
+					tdy=datetime.today()
+					tdy=datetime(tdy.year,tdy.month,tdy.day)
+					results=results.filter(Expiry.BB_Expiry<=tdy)
+
 				state=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
 				if state == True:
 					results=results.order_by(Expiry.BB_Expiry.asc())
@@ -521,7 +528,19 @@ class Expiration:
 						print(msg)
 
 	def rm_expo(self,short=True):
-		toRm=self.search_expo(returnable=True)
+		group=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Group results by Barcode[default=True/Yes]?",helpText="results will be grouped by barcode",data="boolean")
+		if group is None:
+			return
+		elif group in ['d',]:
+			group=True
+
+		protect_unexpired=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Do not delete/'display for delete' non-past-due expiry's?",helpText="if its not expired, dont show it",data="boolean")
+		if protect_unexpired is None:
+			return
+		elif protect_unexpired in ['d',True]:
+			protect_unexpired=True
+
+		toRm=self.search_expo(group=group,returnable=True,past_due_only=protect_unexpired)
 		if toRm is None:
 			print(f"{Fore.orange_red_1}User Cancelled Early{Style.reset}")
 			return
@@ -562,6 +581,11 @@ class Expiration:
 						session.flush()
 
 	def rm_expo_bar(self):
+		protect_unexpired=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Do not delete/'display for delete' non-past-due expiry's?",helpText="if its not expired, dont show it",data="boolean")
+		if protect_unexpired is None:
+			return
+		elif protect_unexpired in ['d',True]:
+			protect_unexpired=True
 		while True:
 			try:
 				fieldname='Remove Expiry by Barcode'
@@ -574,7 +598,12 @@ class Expiration:
 					continue
 				else:
 					with Session(ENGINE) as session:
-						done=session.query(Expiry).filter(Expiry.Barcode==barcode).delete()
+						done=session.query(Expiry).filter(Expiry.Barcode==barcode)
+						if protect_unexpired:
+							tdy=datetime.today()
+							tdy=datetime(tdy.year,tdy.month,tdy.day)
+							done=done.filter(Expiry.BB_Expiry<=tdy)
+						done.delete()
 						session.commit()
 						session.flush()
 						print(f"{Fore.light_red}Done Deleting {Fore.cyan}{done}{Fore.light_red} Expiration Barcodes!{Style.reset}")

radboy-0.0.439/radboy/__init__.py

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

{radboy-0.0.438 → radboy-0.0.439}/radboy.egg-info/PKG-INFO

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

{radboy-0.0.438 → radboy-0.0.439}/setup.py

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

radboy-0.0.438/STDOUT.TXT

@@ -1,125 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"exp"
-#USER INPUT# -> :"swa"
-#USER INPUT# -> :"n"
-#USER INPUT# -> :"swa"
-#USER INPUT# -> :""
-#USER INPUT# -> :"vllo"
-#USER INPUT# -> :"swa"
-#USER INPUT# -> :""
-#USER INPUT# -> :"rllo"
-#USER INPUT# -> :"swa"
-#USER INPUT# -> :""
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"exp"
-#USER INPUT# -> :"swa"
-#USER INPUT# -> :""
-#USER INPUT# -> :"swa"
-#USER INPUT# -> :"rllo"
-#USER INPUT# -> :""
-#USER INPUT# -> :"rllo"
-#USER INPUT# -> :"swa"
-#USER INPUT# -> :""
-#USER INPUT# -> :"rllo"
-#USER INPUT# -> :"swa"
-#USER INPUT# -> :""
-#USER INPUT# -> :"swa"
-#USER INPUT# -> :"n"
-#USER INPUT# -> :"rllo"
-#USER INPUT# -> :"swa"
-#USER INPUT# -> :"n"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.427"
-#USER INPUT# -> :"exp"
-#USER INPUT# -> :"swa"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"exp"
-#USER INPUT# -> :"swa"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"exp"
-#USER INPUT# -> :"swa"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"exp"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"swa"
-#USER INPUT# -> :""
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"#b"
-#USER INPUT# -> :"swa"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.428"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.429"
-#USER INPUT# -> :"0.0.430"
-#USER INPUT# -> :"0.0.431"
-#USER INPUT# -> :"0.0.431"
-#USER INPUT# -> :"0.0.431"
-#USER INPUT# -> :"0.0.431"
-#USER INPUT# -> :"0.0.432"
-#USER INPUT# -> :"0.0.432"
-#USER INPUT# -> :"0.0.432"
-#USER INPUT# -> :"0.0.433"
-#USER INPUT# -> :"0.0.434"
-#USER INPUT# -> :"0.0.435"
-#USER INPUT# -> :"0.0.436"
-#USER INPUT# -> :"0.0.437"
-#USER INPUT# -> :"0.0.438"

radboy-0.0.438/radboy/__init__.py

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