radboy 0.0.437__py3-none-any.whl → 0.0.439__py3-none-any.whl

radboy/DB/db.py

@@ -126,7 +126,7 @@ str(uuid1()):{
         cmdhtext='\n'.join(cmdhtext)
 
         while True:
-            z=input("Boot CMDS:")
+            #z=input("Boot CMDS:")
 
             
             try:
@@ -138,8 +138,8 @@ str(uuid1()):{
                 print("Time's up! No input received.")
                 user_input = "autoboot"
             
-            user_input=z
-            print(user_input)
+            #user_input=z
+            #print(user_input)
             doWhat=self.quick_parse(user_input,helptext=cmdhtext,no_dir_name=True)
             if doWhat is None:
                 exit("User Quit!")

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

@@ -1 +1 @@
-VERSION='0.0.437'
+VERSION='0.0.439'

{radboy-0.0.437.dist-info → radboy-0.0.439.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.437
+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.437.dist-info → radboy-0.0.439.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=IhMCEH4Pxoe1TOKL_sDjvdyuuc4jtCnkRx5elT5sgOw,17
+radboy/__init__.py,sha256=ypYpXMxcQuA-y_7igDIPs8yNw_zUpeUWZN6GNceIrGQ,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
@@ -90,7 +90,7 @@ radboy/DB/SMLabelImporter.py,sha256=eUoBDxVUUEKGL2g_PwkASM67ZB7FmXtSnn4bCagskhY,
 radboy/DB/__init__.py,sha256=JiigA9B7GalP7YuRdcwyGDu5PDSBahoi0lLjtScxlN8,49
 radboy/DB/blankDataFile.py,sha256=YX_05Usi71UpDkZN9UTMYwUipbTndTAtEgqzBEga0kE,9285
 radboy/DB/config.py,sha256=bvu43dUl1_yO3Zq3gsLuenGUgJSiS3S9Cs6ppFEvZbg,239
-radboy/DB/db.py,sha256=kkU3hT1EI91rSec807fL5sZ0vM7garvPIXqevCAmRAI,236187
+radboy/DB/db.py,sha256=giTrfWSjS3DVfuG6Z23vrv9KModGuK8yZI_AsUyvsQo,236190
 radboy/DB/glossary_db.py,sha256=1_qxeEpjjEtpWB_eDjsgJisimLv7OBm75MuqM-Lt6zg,28218
 radboy/DB/masterLookup.py,sha256=DBaM2uscG3_X5dek49wjdnOzhrjWhKgvOEz_umdz0mY,4566
 radboy/DB/msg.txt,sha256=YxWed6A6tuP1djJ5QPS2Rz3ING4TKKf8kUiCCPtzHXE,7937
@@ -125,7 +125,7 @@ radboy/DB/__pycache__/config.cpython-312.pyc,sha256=Qo7E6MHrF6yqvKgepNFyCoekZXiv
 radboy/DB/__pycache__/config.cpython-313.pyc,sha256=_8wCIg_3jhyJjxnExD2Sm6aY-uZTw036p7Ki5znL7dc,376
 radboy/DB/__pycache__/db.cpython-311.pyc,sha256=rNgigyBd0D-cg1JxKAS8t0B_k0IEJivgVlRaZE10Xis,210105
 radboy/DB/__pycache__/db.cpython-312.pyc,sha256=ANDJPC0RoavbmSKFxG15vC7B4rEGyVt7xRJt7XGY3OA,334609
-radboy/DB/__pycache__/db.cpython-313.pyc,sha256=OMYh6TQbYG9D4JVhDLjWyeieMegtFmC990S5B3FRvRU,373744
+radboy/DB/__pycache__/db.cpython-313.pyc,sha256=dtIn83o0Fmb4ZZfsw0Vqq9oJRaff_bX0QUP92WdMN78,373650
 radboy/DB/__pycache__/glossary_db.cpython-312.pyc,sha256=8UL-29cKqtKovx0BANm6kzKKteef1BW_2qF3wumzst4,36023
 radboy/DB/__pycache__/glossary_db.cpython-313.pyc,sha256=Ke9bkvllGv5CK0JdT9DRvQ3MOdrXxoYv7TVLNkqLux0,36582
 radboy/DB/__pycache__/masterLookup.cpython-312.pyc,sha256=bQiOkmMwwHgcO18tYSWGQ-YUff4GQlKVhBMp1GoWAqY,6324
@@ -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=KerxZGyKlPOhwmMV9DNn_TxdHimY5_QmjQ6H82powxA,37762
+radboy/RNE/RNE.py,sha256=CVvdGbmfGHwhafGSxtSBq2hgRCMqVj0tmurS0xwwQao,39014
 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=-P9Ob65csLEsAEhI6vGC8f1WJDot21jQPFjpGmlnElA,74235
+radboy/RNE/__pycache__/RNE.cpython-313.pyc,sha256=-IIlNgmW-7T5ArSDnc-DTqnZvzOy-0nnBZBmIecmrHc,75540
 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=L4V9ylycuewwnErdI12SARIS1EqZF7n5mR0op3cBVls,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=HW52xrHD6N-Rm7xKHpUPhC83L9v9zCrlwMrlkkw2kS4,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.437.dist-info/METADATA,sha256=iC8YejD1a3ugvSeNDgGuHVCecZddJPbwD28GoHxLSWM,1574
-radboy-0.0.437.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.437.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.437.dist-info/RECORD,,
+radboy-0.0.439.dist-info/METADATA,sha256=0jCnxs1zY6ixPdpgTWzImUTZDBntc1G1T3ox0HLpePU,1574
+radboy-0.0.439.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.439.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.439.dist-info/RECORD,,