radboy 0.0.426__tar.gz → 0.0.427__tar.gz

{radboy-0.0.426 → radboy-0.0.427}/PKG-INFO

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

radboy-0.0.427/STDOUT.TXT

@@ -0,0 +1,34 @@
+#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"

{radboy-0.0.426 → radboy-0.0.427}/pyproject.toml

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

{radboy-0.0.426 → radboy-0.0.427}/radboy/RNE/RNE.py

@@ -460,7 +460,7 @@ class Expiration:
 					except Exception as e:
 						print(e)
 
-	def search_expo(self,returnable=False,code=None):
+	def search_expo(self,returnable=False,code=None,group=True):
 		with Session(ENGINE) as session:
 			while True:
 				if code != None:
@@ -498,7 +498,18 @@ class Expiration:
 						Expiry.BB_Expiry==dt,
 						)
 					)
-				results=query.order_by(Expiry.DTOE.asc()).order_by(Expiry.BB_Expiry.asc()).all()
+				if group:
+					results=query.order_by(Expiry.DTOE.asc()).order_by(Expiry.BB_Expiry.asc()).group_by(Expiry.Barcode)
+				else:
+					results=query.order_by(Expiry.DTOE.asc()).order_by(Expiry.BB_Expiry.asc())
+				
+				state=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
+				if state == True:
+					results=results.order_by(Expiry.BB_Expiry.asc())
+				else:
+					results=results.order_by(Expiry.BB_Expiry.desc())
+
+				results=results.all()
 				ct=len(results)
 				if returnable:
 					return results
@@ -574,15 +585,34 @@ class Expiration:
 				return
 
 	async def show_warnings_async(self):
-		await asyncio.to_thread(self.show_warnings)
+		await asyncio.to_thread(lambda self=self:self.show_warnings(boot=True))
 
 
-	def show_warnings(self,barcode=None,export=False,regardless=False,code=None):
+	def show_warnings(self,barcode=None,export=False,regardless=False,code=None,boot=False):
 		with Session(ENGINE) as session:
+			if not boot:
+				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
+			else:
+				group=True
+
 			if barcode == None:
-				results=session.query(Expiry).all()
+				if group:
+					results=session.query(Expiry).group_by(Expiry.Barcode)
+				else:
+					results=session.query(Expiry)
+				state=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
+				if state == True:
+					results=results.order_by(Expiry.BB_Expiry.asc())
+				else:
+					results=results.order_by(Expiry.BB_Expiry.desc())
+					
+				results=results.all()
 			else:
-				results=self.search_expo(returnable=True,code=code)
+				results=self.search_expo(returnable=True,code=code,group=group)
 			if results in [None,]:
 				return
 			ct=len(results)

radboy-0.0.427/radboy/__init__.py

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

{radboy-0.0.426 → radboy-0.0.427}/radboy.egg-info/PKG-INFO

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

{radboy-0.0.426 → radboy-0.0.427}/setup.py

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

radboy-0.0.426/STDOUT.TXT

@@ -1,75 +0,0 @@
-#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"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"1"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"qe"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"1"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"1"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"2"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"lsbld"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"1"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"degree"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"deg"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"degree"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :""
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"ounce"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"floz"
-#USER INPUT# -> :"units"
-#USER INPUT# -> :""
-#USER INPUT# -> :"units"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.426"

radboy-0.0.426/radboy/__init__.py

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