radboy 0.0.384__py3-none-any.whl → 0.0.386__py3-none-any.whl

radboy/DB/db.py

@@ -5066,14 +5066,14 @@ class Scheduled_And_Appointments(BASE,Template):
     Establishment_ZIP_Code=Column(String,default="00000-0000")
     Establishment_Country=Column(String,default="Not Available")
     
-    StartTime=Column(Time,default=time(8,0))
-    EndTime=Column(Time,default=time(21,0))
+    StartTime=Column(Time,default=None)
+    EndTime=Column(Time,default=None)
 
-    StartDate=Column(Date,default=date(datetime.now().year,1,1))
-    EndDate=Column(Date,default=date(datetime.now().year,12,31))
+    StartDate=Column(Date,default=None)
+    EndDate=Column(Date,default=None)
 
-    StartDateTime=Column(DateTime,default=datetime(datetime.now().year,1,1))
-    EndDateTime=Column(DateTime,default=datetime(datetime.now().year,12,25))
+    StartDateTime=Column(DateTime,default=None)
+    EndDateTime=Column(DateTime,default=None)
 
     TotalCost=Column(Float,default=0.000)
     CoPay=Column(Float,default=0.000)

radboy/DayLog/BhTrSa/bhtrsaa.py

@@ -10,29 +10,75 @@ class BhTrSa_Gui:
 		else:
 			display_past_due=True
 
-		stext=Prompt.__init2__(None,func=FormBuilderMkText,ptext="What are you looking for?",helpText="a textwise search",data="string")
+		most_recent_x=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Limit to First, or Last, of Results by X(default={sys.maxsize}):",helpText="an integer",data="integer")
+		if most_recent_x is None:
+			return
+		elif most_recent_x in ['d']:
+			most_recent_x=sys.maxsize
+		
+		offset=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Offset to First, or Last, of Results by X(default=0):",helpText="an integer",data="integer")
+		if offset is None:
+			return
+		elif offset in ['d']:
+			offset=0
+
+		stext=Prompt.__init2__(None,func=FormBuilderMkText,ptext="What are you looking for?",helpText="a textwise search, but may include saa_id",data="string")
 		if stext in  [None,]:
 			return
 		lu_state=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
 		includes=["varchar","string","str","text"]
 		sfields=[str(i.name) for i in BusinessHours.__table__.columns if str(i.type).lower() in includes]
 		with Session(ENGINE) as session:
+			def mquery(lu_state,display_past_due,squery,offset,most_recent_x):
+				if lu_state:	
+					sorted_query=squery.order_by(Scheduled_And_Appointments.StartDate.asc(),Scheduled_And_Appointments.StartDateTime.asc(),Scheduled_And_Appointments.DTOE.asc())
+				else:
+					sorted_query=squery.order_by(Scheduled_And_Appointments.StartDate.desc(),Scheduled_And_Appointments.StartDateTime.desc(),Scheduled_And_Appointments.DTOE.desc())
+				now=datetime.now()
+				if not display_past_due:
+					sorted_query=sorted_query.filter(or_(
+						and_(Scheduled_And_Appointments.StartDate!=None,Scheduled_And_Appointments.StartDate>=date(now.year,now.month,now.day)),
+						and_(Scheduled_And_Appointments.StartDateTime !=None,Scheduled_And_Appointments.StartDateTime>=datetime(now.year,now.month,now.day))
+						)
+					)
+				else:
+					sorted_query=sorted_query.filter(or_(
+						and_(Scheduled_And_Appointments.StartDate!=None,Scheduled_And_Appointments.StartDate<=date(now.year,now.month,now.day)),
+						and_(Scheduled_And_Appointments.StartDateTime !=None,Scheduled_And_Appointments.StartDateTime<=datetime(now.year,now.month,now.day))
+						)
+					)
+				limited_query=sorted_query.offset(offset).limit(most_recent_x)
+				
+				return limited_query
+
 			query=session.query(Scheduled_And_Appointments)
-			q=[]
-			if stext != 'd':
-				for i in sfields:
-					q.append(getattr(Scheduled_And_Appointments,i).icontains(stext))
-				squery=query.filter(or_(*q))
-			else:
-				squery=query
-			if lu_state:	
-				sorted_query=squery.order_by(Scheduled_And_Appointments.DTOE.asc())
-			else:
-				sorted_query=squery.order_by(Scheduled_And_Appointments.DTOE.desc())
-			now=datetime.now()
-			if not display_past_due:
-				sorted_query=sorted_query.filter(Scheduled_And_Appointments.StartDate>date(now.year,now.month,now.day))
-			results=sorted_query.all()
+			
+			def stage2(query,sfields,stext):
+				q=[]
+				if stext != 'd':
+					for i in sfields:
+						q.append(getattr(Scheduled_And_Appointments,i).icontains(stext))
+					squery=query.filter(or_(*q))
+				else:
+					squery=query
+				return squery
+
+			try:
+				print(stext)
+				if stext != 'd':
+					print(stext)
+					SAA_id=int(stext)
+					squery=query.filter(Scheduled_And_Appointments.saa_id==SAA_id)
+				else:
+					squery=stage2(query,sfields,stext)
+					squery=mquery(lu_state,display_past_due,squery,offset,most_recent_x)
+			except Exception as e:
+				print(f"{Fore.light_red}could not use '{stext}' as saa_id{Fore.light_steel_blue} this is not a failure{Style.reset}",e,repr(e))
+				squery=stage2(query,sfields,stext)
+				squery=mquery(lu_state,display_past_due,squery,offset,most_recent_x)
+			
+			results=squery.all()	
+			#sorted_query.all()
 			ct=len(results)
 			htext=[]
 			if ct == 0:
@@ -344,8 +390,10 @@ class BhTrSa_Gui:
 			fd=FormBuilder(data=fields)
 			if fd is None:
 				return
+			
 			for i in fd:
 				setattr(newBH,i,fd[i])
+
 			session.add(newBH)
 			session.commit()
 			session.refresh(newBH)

radboy/FB/FBMTXT.py

@@ -1,7 +1,7 @@
 import radboy.TasksMode as TM
 import radboy.DB.db as db
 import string
-from datetime import datetime
+from datetime import datetime,date,time
 from pathlib import Path
 from decimal import Decimal,getcontext
 import re
@@ -174,10 +174,73 @@ def FormBuilderMkText(text,data,passThru=[],PassThru=True,alternative_false=None
             value=text
         elif data.lower() == 'date':
             if text.lower() in ['y','yes','1','t','true']:
-                value=value=TM.Tasks.TasksMode(parent=None,engine=db.ENGINE,init_only=True).DatePkr()
+                value=TM.Tasks.TasksMode(parent=None,engine=db.ENGINE,init_only=True).DatePkr()
+            else:
+                try:
+                    def try_date(ds,format='%m%d%Y'):
+                        try:
+                            #print(format)
+                            return datetime.strptime(ds,format)
+                        except Exception as e:
+                            #print(e)
+                            return None
+                    def process_ds(ds):
+                        months=['january','february','march','april','may','june','july','august','september','october','november','december']
+                        predate="%m{c}%d{c}{year}"
+                        t1=[]
+                        chars=[i for i in string.punctuation]
+                        chars.pop(chars.index('%'))
+                        for i in chars:
+                            test=ds.split(i)
+                            if len(test) == 3:
+                                for num,m in enumerate(months):
+                                    if test[0].lower() == m or m.startswith(test[0].lower()):
+                                        test[0]=str(num+1).zfill(2)
+                                        ds=f'{i}'.join(test)
+                                        break
+                        for i in chars:
+                            for year in ['%y','%Y']:
+                                t1.append(predate.format(c=i,year=year))
+                                for ii in chars:
+                                    for year in ['%y','%Y']:
+                                        t1.append(f"%m{i}%d{ii}{year}")
+                        for f in t1:
+                                dt=try_date(format=f,ds=ds)
+                                if dt:
+                                    return dt
+                    value=process_ds(text)
+                except Exception as e:
+                    print(e)
         elif data.lower() == 'time':
             if text.lower() in ['y','yes','1','t','true']:
-                value=value=TM.Tasks.TasksMode(parent=None,engine=db.ENGINE,init_only=True).TimePkr()
+                value=TM.Tasks.TasksMode(parent=None,engine=db.ENGINE,init_only=True).TimePkr()
+            else:
+                try:
+                    def try_time(ds,format='%m%d%Y'):
+                        try:
+                            #print(format)
+                            todaysDate=datetime.strptime(ds,format)
+                            return time(todaysDate.hour,todaysDate.minute,todaysDate.second)
+                        except Exception as e:
+                            print(e)
+                            return None
+                    def process_time(ds):
+                        predate="%H{c}%M{c}%S"
+                        t1=[]
+                        chars=[i for i in string.punctuation]
+                        chars.pop(chars.index('%'))
+
+                        for i in chars:
+                            t1.append(predate.format(c=i))
+                            for ii in chars:
+                                t1.append(f"%H{i}%M{ii}%S")
+                        for f in t1:
+                            dt=try_time(format=f,ds=ds)
+                            if dt:
+                                return dt
+                    value=process_time(text)
+                except Exception as e:
+                    print(e)
         elif data.lower() in ['datetime','datetime-','datetime~']:
             try:
                 

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.384'
+VERSION='0.0.386'

{radboy-0.0.384.dist-info → radboy-0.0.386.dist-info}/METADATA

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

{radboy-0.0.384.dist-info → radboy-0.0.386.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=XXy-o5Z_yOgrgHNju4iqM3h7xhRBkNIoHG1qePtBnGY,41316
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=xuIRMPmHaAcv0S_dloafHTDtAxq34ngYjhRcdt_7mnE,17
+radboy/__init__.py,sha256=MO1KiVymotj1qsEJvZr8Yi4x-WdnLmyK9Fwh6hJdFnA,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=PMNTlfGH4BFJJLOVXwHmm6MB8O3VIeS0D0aQ1roNCbg,234272
+radboy/DB/db.py,sha256=2FKqmdrXe5XWbzw_XYjIrBhzrS6DmxPl3W5Ekx4xcU8,234149
 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=TzOvoadaFkdsLOoEi1vFsdXCzObzQMcRKeivoods7dM,370574
+radboy/DB/__pycache__/db.cpython-313.pyc,sha256=PgUaizVSkdeBXTa4cBCjbQ5bmv3xlURvz5TzFsR7qj0,370136
 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
@@ -139,7 +139,7 @@ radboy/DayLog/TaxiFares.py,sha256=3slYjtBcTnRe8IeneJ-_iZJJ3E7alW09f6GWYXPxhOo,10
 radboy/DayLog/Wavelength4Freq.py,sha256=MfN2EATrN3bbEDgP1qOPjV1Fk8sVnkc_4tgX6sKfSE0,2054
 radboy/DayLog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/DayLog/BhTrSa/__init__.py,sha256=q6xDsXAiWpQR2QWILKZKf--D3apR_KOE1CRbZaP7Vq4,976
-radboy/DayLog/BhTrSa/bhtrsaa.py,sha256=2BfClss38UcJiN-jf7aJ8Jfluanws_Jk6JZHuxah360,13970
+radboy/DayLog/BhTrSa/bhtrsaa.py,sha256=9zEPvLOyf7hZvrBE867yTUNAIVE_OZQp7CAaXdLbpRQ,16039
 radboy/DayLog/__pycache__/DayLogger.cpython-311.pyc,sha256=TmRnRZHp5tMTokSEB8hWTxnasi-iJdh6TmYcb_nXGoY,29557
 radboy/DayLog/__pycache__/DayLogger.cpython-312.pyc,sha256=bfDCQZrIhgQYzoUle7roicRE_bhGPYZtIbCRIiDrsxU,68240
 radboy/DayLog/__pycache__/DayLogger.cpython-313.pyc,sha256=L3BYIw7SMXTsTK64KnTRg0mn-CRZn2Eq-4rjh75JXcs,151046
@@ -190,11 +190,11 @@ radboy/ExtractPkg/__pycache__/ExtractPkg2.cpython-313.pyc,sha256=bgw-00G_ouurOtO
 radboy/ExtractPkg/__pycache__/__init__.cpython-311.pyc,sha256=62yPgrgPZffZFLr6FscOqCdo45vfhScJ8aZbLTbD7I4,235
 radboy/ExtractPkg/__pycache__/__init__.cpython-312.pyc,sha256=Ll1iKcG0MDtoCIloQ_frcihvCSe1HPtyERzcAoXwQT0,273
 radboy/ExtractPkg/__pycache__/__init__.cpython-313.pyc,sha256=kL3Y3KxCTaGNg3aq5fhf2fsnQHZolGfvniEUfsx2bwY,152
-radboy/FB/FBMTXT.py,sha256=UhD6DbKW9jaCuaw6Ju-mmi-Kgx2RipB1ysOITiZfsqw,19424
+radboy/FB/FBMTXT.py,sha256=D2x_EkKA8v0O0Oku_cPRshBOOwYKBvNLQvVeY6eGAx4,22431
 radboy/FB/FormBuilder.py,sha256=oOlGmvrUaAOVf0DpM_wlHKfIyz-Q8WU9pJRZ7XPzdQg,14275
 radboy/FB/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/FB/__pycache__/FBMTXT.cpython-312.pyc,sha256=XCVFa7Mo83LGIdRrTvcK73siUpcVIEQfXKCH2QHeViw,9626
-radboy/FB/__pycache__/FBMTXT.cpython-313.pyc,sha256=sF3WL-63m1AjAOTxhfwMlkRvz7Axag5gRv9Nqitcj1k,31133
+radboy/FB/__pycache__/FBMTXT.cpython-313.pyc,sha256=Lz0Lz_aTeF3phBfU-hksKzIfiAVA9qf0WSFGdoKV_H8,33891
 radboy/FB/__pycache__/FormBuilder.cpython-312.pyc,sha256=lNQdB-zApsXM7OQF9MIi0zRZD1SAL6stKEN-AyQiIKg,18873
 radboy/FB/__pycache__/FormBuilder.cpython-313.pyc,sha256=WOX7ndix3aTqTaF01w1x4X_b-DX15RAoBdH7_L5NPCc,19706
 radboy/FB/__pycache__/__init__.cpython-312.pyc,sha256=ULEL8Au_CxcYpNAcSoSbI65M7-av1W6Zuy6kQJUu-Mw,265
@@ -388,7 +388,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=_dTRrTnEELa-a2BwzVmpLlZOSbh9uHViJR-_NU3VfGQ,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=pOoMOpj2gNP83Kq-8l6vPzRD39uZ2eWtBOQbqCRVXIQ,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
@@ -413,7 +413,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.384.dist-info/METADATA,sha256=3ORA8SXWXV2MYmnACZ3ewAazlRNV3ZUjspiipcf5Ex4,794
-radboy-0.0.384.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.384.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.384.dist-info/RECORD,,
+radboy-0.0.386.dist-info/METADATA,sha256=zIZN0-nLK610SL_h1HA_RCKZbpT1orEfzuTd-O1RLe4,794
+radboy-0.0.386.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.386.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.386.dist-info/RECORD,,