radboy 0.0.509__tar.gz → 0.0.510__tar.gz

{radboy-0.0.509 → radboy-0.0.510}/PKG-INFO

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

radboy-0.0.510/STDOUT.TXT

@@ -0,0 +1,25 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"fcmd"
+#USER INPUT# -> :"hl"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"lsbs"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :""
+#USER INPUT# -> :"ls"
+#USER INPUT# -> :"lsbs"
+#USER INPUT# -> :""
+#USER INPUT# -> :"6.03.25"
+#USER INPUT# -> :"today"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"ls"
+#USER INPUT# -> :"lsbs"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"last month start"
+#USER INPUT# -> :""
+#USER INPUT# -> :"y"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.510"

{radboy-0.0.509 → radboy-0.0.510}/pyproject.toml

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

{radboy-0.0.509 → radboy-0.0.510}/radboy/HealthLog/HealthLog.py

@@ -417,12 +417,35 @@ class HealthLogUi:
 
 	def showAllField(self,fields=[],not_none=[]):
 		try:
+			useDateRange=Prompt.__init2__(None,func=FormBuilderMkText,ptext="use a date range?",helpText="yes or no",data="boolean")
+			if useDateRange is None:
+				return
+			elif useDateRange in ['d',]:
+				useDateRange=True
+
 			gf=fields
 			fields.extend(["DTOE","HLID","Comments"])
 			fields=[i for i in HealthLog.__table__.columns if str(i.name) in fields]
 			not_none=[i for i in HealthLog.__table__.columns if str(i.name) in not_none]
 			with Session(ENGINE) as session:
 				results=session.query(HealthLog).filter(or_(*[i!=None for i in not_none]))
+				if useDateRange:
+					default_sd=datetime.now()-timedelta(days=30)
+					start_date=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Start Date(default = {default_sd}):",helpText="start date",data="datetime")
+					if start_date is None:
+						return
+					elif start_date in ['d',]:
+						start_date=default_sd
+
+					default_ed=datetime.now()
+					end_date=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"End Date(default = {default_ed}):",helpText="end date",data="datetime")
+					if end_date is None:
+						return
+					elif end_date in ['d',]:
+						end_date=default_ed
+
+					results=results.filter(and_(HealthLog.DTOE>=start_date,HealthLog.DTOE<=end_date))
+
 				results=orderQuery(results,HealthLog.DTOE)
 				
 				graph_it=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Graph Results (if possible)[y/N]:",helpText="yes or no; default is No.",data="boolean")

radboy-0.0.510/radboy/__init__.py

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

{radboy-0.0.509 → radboy-0.0.510}/radboy.egg-info/PKG-INFO

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

{radboy-0.0.509 → radboy-0.0.510}/setup.py

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

radboy-0.0.509/STDOUT.TXT

@@ -1,112 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"lsbld"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"pot"
-#USER INPUT# -> :"mksl"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"pot"
-#USER INPUT# -> :"n"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"spoti"
-#USER INPUT# -> :"qc"
-#USER INPUT# -> :"set"
-#USER INPUT# -> :"2"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"set 10,2"
-#USER INPUT# -> :"set"
-#USER INPUT# -> :"10,2"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"0.05"
-#USER INPUT# -> :"0.79"
-#USER INPUT# -> :"y"
-#USER INPUT# -> :""
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"lsbld"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"03200493"
-#USER INPUT# -> :""
-#USER INPUT# -> :"qc"
-#USER INPUT# -> :"set"
-#USER INPUT# -> :"10,2"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"0.10"
-#USER INPUT# -> :"0.99"
-#USER INPUT# -> :"y"
-#USER INPUT# -> :""
-#USER INPUT# -> :"b"
-#USER INPUT# -> :""
-#USER INPUT# -> :"03200493"
-#USER INPUT# -> :""
-#USER INPUT# -> :"1"
-#USER INPUT# -> :"lslbld"
-#USER INPUT# -> :""
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"v"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"lsbld"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"03201519"
-#USER INPUT# -> :""
-#USER INPUT# -> :"mksl"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"03201519"
-#USER INPUT# -> :""
-#USER INPUT# -> :"qc"
-#USER INPUT# -> :"set"
-#USER INPUT# -> :"10,2"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"0.05"
-#USER INPUT# -> :"0.99"
-#USER INPUT# -> :"y"
-#USER INPUT# -> :""
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"1"
-#USER INPUT# -> :"lsbld"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"842595121759"
-#USER INPUT# -> :"qc"
-#USER INPUT# -> :"set"
-#USER INPUT# -> :"10,8,2"
-#USER INPUT# -> :"1"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"0.15"
-#USER INPUT# -> :"n"
-#USER INPUT# -> :"lsbld"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"ph"
-#USER INPUT# -> :"use"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"ss"
-#USER INPUT# -> :"842595"
-#USER INPUT# -> :"1"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"qc"
-#USER INPUT# -> :"set"
-#USER INPUT# -> :"8"
-#USER INPUT# -> :"1"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"lsbld"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.509"

radboy-0.0.509/radboy/__init__.py

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