radboy 0.0.386__tar.gz → 0.0.387__tar.gz

{radboy-0.0.386 → radboy-0.0.387}/PKG-INFO

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

{radboy-0.0.386 → radboy-0.0.387}/STDOUT.TXT

@@ -133,3 +133,46 @@
 #USER INPUT# -> :"q"
 #USER INPUT# -> :"e"
 #USER INPUT# -> :"0.0.386"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"nxt saa"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"nxt saa"
+#USER INPUT# -> :"2"
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"nxt"
+#USER INPUT# -> :"saa"
+#USER INPUT# -> :"nxt saa"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"nxt saa"
+#USER INPUT# -> :"1"
+#USER INPUT# -> :""
+#USER INPUT# -> :"nxt saa"
+#USER INPUT# -> :"1"
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"nxt"
+#USER INPUT# -> :"nxt saa"
+#USER INPUT# -> :"nxt saa"
+#USER INPUT# -> :"h"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"nxt saa"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"nxt saa"
+#USER INPUT# -> :"1"
+#USER INPUT# -> :""
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.387"

{radboy-0.0.386 → radboy-0.0.387}/pyproject.toml

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

{radboy-0.0.386 → radboy-0.0.387}/radboy/DayLog/BhTrSa/bhtrsaa.py

@@ -1,6 +1,44 @@
 from . import *
 import uuid
 class BhTrSa_Gui:
+
+	def next_saa(self):
+		with Session(ENGINE) as session:
+			now=datetime.now()
+			query=session.query(Scheduled_And_Appointments)
+			date_filtered_query=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))
+				)
+			)
+
+			#ordered_query=date_filtered_query.order_by(Scheduled_And_Appointments.StartDate.asc(),Scheduled_And_Appointments.StartDateTime.asc())
+
+			most_recent_x=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"How many results(default=3)?:",helpText="an integer",data="integer")
+			if most_recent_x is None:
+				return
+			elif most_recent_x in ['d']:
+				most_recent_x=3
+			
+			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
+
+			lu_state=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
+			if not lu_state:	
+				ordered_query=date_filtered_query.order_by(Scheduled_And_Appointments.StartDate.asc(),Scheduled_And_Appointments.StartDateTime.asc())
+			else:
+				ordered_query=date_filtered_query.order_by(Scheduled_And_Appointments.StartDate.desc(),Scheduled_And_Appointments.StartDateTime.desc())
+			limited_query=ordered_query.limit(most_recent_x)
+			offset_query=limited_query.offset(offset)
+			results=offset_query.all()
+			ct=len(results)
+			for num,i in enumerate(results):
+				print(i.colorize(i,num,ct))
+
+
 	def search_saa(self,returnable=False):
 		display_past_due=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Display past due SAA's[False==Default]?",helpText="boolean yes or no[default]",data="boolean")
 		if display_past_due is None:
@@ -30,7 +68,7 @@ class BhTrSa_Gui:
 		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:	
+				if not 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())
@@ -467,15 +505,20 @@ class BhTrSa_Gui:
 			'desc':"create a  schedules and appointments entry"
 			},
 			uuid.uuid1():{
-			'cmds':['esaa','edit  '],
+			'cmds':['esaa','edit schedules and appointments'],
 			'exec':self.edit_saa,
-			'desc':"edit a  schedules and appointments entry"
+			'desc':"edit a chedules and appointments entry"
 			},
 			uuid.uuid1():{
-			'cmds':['rmsaa','rm  '],
+			'cmds':['rmsaa','rm schedules and appointments'],
 			'exec':self.rm_saa,
 			'desc':"remove a schedules and appointments entry"
 			},
+			uuid.uuid1():{
+			'cmds':['nxt saa','next schedules and appointments'],
+			'exec':self.next_saa,
+			'desc':"display next x of schedules and appointments entry that are not past due"
+			},
 		}
 		htext=[]
 		for cmd in cmds:

radboy-0.0.387/radboy/__init__.py

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

{radboy-0.0.386 → radboy-0.0.387}/radboy.egg-info/PKG-INFO

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

{radboy-0.0.386 → radboy-0.0.387}/setup.py

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

radboy-0.0.386/radboy/__init__.py

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