radboy 0.0.426__py3-none-any.whl → 0.0.427__py3-none-any.whl

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/__init__.py

@@ -1 +1 @@
-VERSION='0.0.426'
+VERSION='0.0.427'

{radboy-0.0.426.dist-info → radboy-0.0.427.dist-info}/METADATA

@@ -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.dist-info → radboy-0.0.427.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=0qFnt3gEk58-8S1uCmVBbtOItFJ0zp0Yt7RqXsF0ksY,41364
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=hq5nNR68tNgPiC_M7R1sBOKY2mt1K70PEUkjLKXR8Aw,17
+radboy/__init__.py,sha256=Jkzro4aJK5rrIOueZ3G0yhUR_QRm8M9CHrb3yMGudEw,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
@@ -292,11 +292,11 @@ radboy/PunchCard/__pycache__/PunchCard.cpython-313.pyc,sha256=N8L4cP6iQldfDcYZNx
 radboy/PunchCard/__pycache__/__init__.cpython-311.pyc,sha256=Off5ltCdLUEhm2xHBufyQYZn3cmJ0FHMb5ZiZpzi6cI,234
 radboy/PunchCard/__pycache__/__init__.cpython-312.pyc,sha256=Y6qJWX7nupibrd15D5ZkcLV2B9QucwyIu6Mz3YFv-Bw,272
 radboy/PunchCard/__pycache__/__init__.cpython-313.pyc,sha256=aa7buQA_iDOOynayLa8DRx1TYsKRpB9VkhwoL1n8LDU,151
-radboy/RNE/RNE.py,sha256=Z1LRxvw44Sz34jORWdQsu3BIRpmlcC6RyvpGENk21Nc,36201
+radboy/RNE/RNE.py,sha256=Nmsq6QXWRgd73hexkYpGxPj1_UKyrc3gWAz06_MOASI,37278
 radboy/RNE/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/RNE/dateAhead.py,sha256=g5pp84vteEkYlxRi5rgo6p2Z6PyoBmozljlnWx8twMs,1594
 radboy/RNE/__pycache__/RNE.cpython-312.pyc,sha256=TCmgh08Ac9MDZgJZwb-_cpCATcLu04wp_HPNtXBrwFw,54377
-radboy/RNE/__pycache__/RNE.cpython-313.pyc,sha256=NW6XQJCa83rw6VG1YPIzpC6_UrGfEv0k-u1rxDvnAJ0,71970
+radboy/RNE/__pycache__/RNE.cpython-313.pyc,sha256=Ha-9e9GM9P0RnWsLW8Fx9dpHz5FdRfGPY--opgCh2jM,73725
 radboy/RNE/__pycache__/__init__.cpython-312.pyc,sha256=uV2pHPbmeCebUp_7Fx1oOhe0ccQGsOtaCzVRFmj6IAg,266
 radboy/RNE/__pycache__/__init__.cpython-313.pyc,sha256=7J11knluwp7WjdVRcd4526_Y1LJo_nH4Kg3rNKIc77U,145
 radboy/Repack/Repack.py,sha256=JmGpsVWUIW71dwARwcuG_L2PP6puYbwRjVy1NJ9tYH8,42593
@@ -390,7 +390,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=NSJDnWfSFiVgdTB96PYASq_vDbVpQI60Qw1tqt9v8RE,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=BwcQNDVYLxRdh8j74FBcW2jaOZ404ezZG92jUhJjo1g,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
@@ -415,7 +415,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.426.dist-info/METADATA,sha256=tl8QrVKCNV45nh2j2tGqiJgTjGDd7hlYj-F20oBIVWw,794
-radboy-0.0.426.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.426.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.426.dist-info/RECORD,,
+radboy-0.0.427.dist-info/METADATA,sha256=KJkIU15XGFXwDXGwYlZ6yWsqbLx3ezTz-1cZlHfFzqM,794
+radboy-0.0.427.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.427.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.427.dist-info/RECORD,,