radboy 0.0.539__tar.gz → 0.0.540__tar.gz

{radboy-0.0.539 → radboy-0.0.540}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.539
+Version: 0.0.540
 Summary: A Retail Calculator for Android/Linux
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

radboy-0.0.540/STDOUT.TXT

@@ -0,0 +1,33 @@
+#USER INPUT# -> :"hl"
+#USER INPUT# -> :"ls welsh"
+#USER INPUT# -> :""
+#USER INPUT# -> :"n"
+#USER INPUT# -> :""
+#USER INPUT# -> :"ls welsh"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"grams"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"grams"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"ls welsh"
+#USER INPUT# -> :""
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.540"

{radboy-0.0.539 → radboy-0.0.540}/pyproject.toml

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

{radboy-0.0.539 → radboy-0.0.540}/radboy/DB/db.py

@@ -32,19 +32,30 @@ import platform
 from uuid import uuid1
 import sys
 from inputimeout import inputimeout, TimeoutOccurred
-
+def remove_illegals(text):
+    if isinstance(text,str):
+        iis=['*','/','\\','?','[',']',':',"\""]
+        for i in iis:
+            text=text.replace(i,f' BCO_UC_{ord(i)} ')
+        return text
+    else:
+        return text
+        
 def strip_colors(colored_text):
-    text=colored_text
-    colors=[getattr(Fore,i) for i in Fore._COLORS]
-    colors2=[getattr(Fore,i) for i in Back._COLORS]
-    styles3=[getattr(Style,i) for i in Style._STYLES]
-    #text=''.join([i for i in text if i in string.printable])
-    escape_codes=[]
-    escape_codes.extend(colors)
-    escape_codes.extend(colors2)
-    escape_codes.extend(styles3)
-    for i in escape_codes:
-        text=text.replace(i,'')
+    if isinstance(colored_text,str):
+        text=colored_text
+        colors=[getattr(Fore,i) for i in Fore._COLORS]
+        colors2=[getattr(Back,i) for i in Back._COLORS]
+        styles3=[getattr(Style,i) for i in Style._STYLES]
+        #text=''.join([i for i in text if i in string.printable])
+        escape_codes=[]
+        escape_codes.extend(colors)
+        escape_codes.extend(colors2)
+        escape_codes.extend(styles3)
+        for i in escape_codes:
+            text=text.replace(i,'')
+    else:
+        return colored_text
     return text
 
 class BOOLEAN_ANSWERS:

{radboy-0.0.539 → radboy-0.0.540}/radboy/HealthLog/HealthLog.py

@@ -267,26 +267,80 @@ class HealthLogUi:
 			print(e)
 
 	def export_log(self):
+		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
 		output=Path("HealthLogAll.xlsx")
 		with Session(ENGINE) as session:
 			query=session.query(HealthLog)
 			query=orderQuery(query,HealthLog.DTOE)
+			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
+
+				query=query.filter(and_(HealthLog.DTOE>=start_date,HealthLog.DTOE<=end_date))
+
 			df=pd.read_sql(query.statement,session.bind)
+			
+			#str.replace(lambda x:x,lambda x:strip_colors(x))
+			#df=df.apply(remove_illegals)
+			for i in df:
+				df[i]=df[i].apply(lambda x:remove_illegals(strip_colors(x)) if isinstance(x,str) else x)
+				#df[i]=df[i].apply(remove_illegals)
 			df.to_excel(output,index=False)
 			print(output.absolute())
 
 	def export_log_field(self,fields=[],not_none=[]):
+		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
+
 		if 'DTOE' not in fields:
 			fields.append('DTOE')
 		if 'Comments' not in fields:
 			fields.append('Comments')
-		output=Path(f"HealthLog-{'_'.join(fields)}.xlsx")
+		output=Path(f"HealthLog-fields.xlsx")
 		not_none=[i for i in HealthLog.__table__.columns if str(i.name) in not_none]
 		with Session(ENGINE) as session:
 			query=session.query(HealthLog).filter(or_(*[i!=None for i in not_none]))
 			query=orderQuery(query,HealthLog.DTOE)
+			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
+
+				query=query.filter(and_(HealthLog.DTOE>=start_date,HealthLog.DTOE<=end_date))
+			query=orderQuery(query,HealthLog.DTOE)
 			df=pd.read_sql(query.statement,session.bind)
+
 			df=df[fields]
+			for i in df:
+				df[i]=df[i].apply(lambda x:remove_illegals(strip_colors(x)) if isinstance(x,str) else x)
 			df.to_excel(output,index=False)
 			print(output.absolute())
 
@@ -662,6 +716,11 @@ class HealthLogUi:
 			'desc':'list height',
 			'exec':lambda self=self:self.showAllField(fields=['Height','HeightUnitName'],not_none=['Height',])
 			},
+			'ls welsh':{
+			'cmds':['ls welsh','list welsh'],
+			'desc':'list data for diabete\'s dr.',
+			'exec':lambda self=self:self.showAllField(fields=['BloodSugar','BloodSugarUnitName','LongActingInsulinName','LongActingInsulinTaken','LongActingInsulinUnitName','ShortActingInsulinName','ShortActingInsulinTaken','ShortActingInsulinUnitName','HeartRate','HeartRateUnitName','DrugConsumed','DrugQtyConsumed','DrugQtyConsumedUnitName','CarboHydrateIntake','CarboHydrateIntakeUnitName','Comments',],not_none=['Comments',])
+			},
 			'ls consumed':{
 				'cmds':['lsfd','ls fd','ls food','lfd','ls fuel','ls fl','lfl'],
 				'desc':'list food',
@@ -720,6 +779,16 @@ class HealthLogUi:
 			'desc':'export height',
 			'exec':lambda self=self:self.export_log_field(fields=['Height','HeightUnitName'],not_none=['Height',])
 			},
+			'xpt cmts':{
+			'cmds':['xptcmts','xpt cmts','xpt cmt',],
+			'desc':'export height',
+			'exec':lambda self=self:self.export_log_field(fields=['Comments',],not_none=['Comments',])
+			},
+			'xpt welsh':{
+			'cmds':['export welsh','xpt welsh'],
+			'desc':'export data for diabete\'s dr.',
+			'exec':lambda self=self:self.export_log_field(fields=['BloodSugar','BloodSugarUnitName','LongActingInsulinName','LongActingInsulinTaken','LongActingInsulinUnitName','ShortActingInsulinName','ShortActingInsulinTaken','ShortActingInsulinUnitName','HeartRate','HeartRateUnitName','DrugConsumed','DrugQtyConsumed','DrugQtyConsumedUnitName','CarboHydrateIntake','CarboHydrateIntakeUnitName','Comments',],not_none=['Comments',])
+			},
 			'xpt consumed':{
 				'cmds':['xptfd','xpt fd','xpt food','lfd','xpt fuel','xpt fl','xlfl'],
 				'desc':'export food',

radboy-0.0.540/radboy/__init__.py

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

{radboy-0.0.539 → radboy-0.0.540}/radboy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.539
+Version: 0.0.540
 Summary: A Retail Calculator for Android/Linux
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

{radboy-0.0.539 → radboy-0.0.540}/setup.py

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

radboy-0.0.539/STDOUT.TXT

@@ -1,25 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"price"
-#USER INPUT# -> :"9"
-#USER INPUT# -> :""
-#USER INPUT# -> :"17.4"
-#USER INPUT# -> :"y"
-#USER INPUT# -> :""
-#USER INPUT# -> :"price"
-#USER INPUT# -> :"9"
-#USER INPUT# -> :""
-#USER INPUT# -> :"17.4"
-#USER INPUT# -> :"y"
-#USER INPUT# -> :"3"
-#USER INPUT# -> :"price"
-#USER INPUT# -> :"3"
-#USER INPUT# -> :"2.46"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"y"
-#USER INPUT# -> :"2"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.539"

radboy-0.0.539/radboy/__init__.py

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