radboy 0.0.539__py3-none-any.whl → 0.0.540__py3-none-any.whl

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

@@ -1 +1 @@
-VERSION='0.0.539'
+VERSION='0.0.540'

{radboy-0.0.539.dist-info → radboy-0.0.540.dist-info}/METADATA

@@ -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.dist-info → radboy-0.0.540.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=Lt2reA6xchq3U7Y08DvkrHboZ25i1ts7X2E9gSIwcVg,41101
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=XZEkE6ptPqnIDOuoFV2zEYd7MEoLvdmgetfPoEH6XQ8,17
+radboy/__init__.py,sha256=IN39UFe_BpEb1kjIOEJ_13ex057coNV2ABypTjPJhf8,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
@@ -91,7 +91,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=b47WCPLuTztsyeqhL3tguCvgg0ngRCygAe1zBBHNmzA,249742
+radboy/DB/db.py,sha256=k2PqEz2g3_fhnDwaAsuQzZCK5w39MvCso5JyHvL29dA,250099
 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
@@ -126,7 +126,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=FHc5BCSxQOBWuGWGR2Pza2Q_xFE1EazGt3ix8NQHzq0,394073
+radboy/DB/__pycache__/db.cpython-313.pyc,sha256=LLReDWyLt1f7770vYYqzAQb_YAn8HwJmAIFgfw8zIKo,394549
 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
@@ -209,10 +209,10 @@ radboy/GeoTools/__pycache__/GeoClass.cpython-313.pyc,sha256=eZ6hpLKoic1XCb7BKKg-
 radboy/GeoTools/__pycache__/OSMClass.cpython-312.pyc,sha256=5RoT8_wiI8R7yb_B9FWIC7mALdGNoqyWtkzsjM2pbh0,40387
 radboy/GeoTools/__pycache__/__init__.cpython-312.pyc,sha256=Y7Xtrzwm44-xuY_4NK8aDjYfVmXIzUFWOyexJu9le8A,1238
 radboy/GeoTools/__pycache__/__init__.cpython-313.pyc,sha256=-bk9eEIxWZgHYZHtNJbrpubDRWkbdYNkGr5J7sVhyIE,1238
-radboy/HealthLog/HealthLog.py,sha256=2Yir-gjhCLp0JT4Df0akgc8fbLPFoITjGeJ1JwQyoLU,29623
+radboy/HealthLog/HealthLog.py,sha256=5fcJlfHrxcdeOp4XV34Vfo7jLv2MAo3Kuh3nhGmNFGc,32978
 radboy/HealthLog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/HealthLog/__pycache__/HealthLog.cpython-312.pyc,sha256=hTo4o7jo9L2yqPZgzuKUw_kon_PVcCuTRguELTuLrIo,27946
-radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=fmkRYVTYm1Lhc_ygjcDQjaLSSUOckRQf7kFtFBhgV6Y,47337
+radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=0QTClasQofJn1kqzSB9lSb4L91DJz2dANs_b7PndNg8,50814
 radboy/HealthLog/__pycache__/__init__.cpython-312.pyc,sha256=yZrYKBk31pGSjCRqmqzpX409iw-muC1zsNO2ObqkGlY,272
 radboy/HealthLog/__pycache__/__init__.cpython-313.pyc,sha256=cqdZbEJKq9XVoVqDAwsW0pwwBBGSerJNWGlST3YVR3g,151
 radboy/InListRestore/ILR.py,sha256=s8fbbHLKQSVJX1VaeyGE-vdIUGBEbOPX29kRIG2j2WY,16847
@@ -397,7 +397,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=sXg8HGniDfaRuh3wnRa0eTT9gqd3Td1PD_VP0PB9Vsg,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=VavoVd5lBQMdjJRgC1YiZuqVnLPIdABYyOcAxusCTa4,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
@@ -422,7 +422,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.539.dist-info/METADATA,sha256=I9ZYo5Zbz2NyHJvah7tSENDZWp8c09SaFvx84yHG85Y,1615
-radboy-0.0.539.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.539.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.539.dist-info/RECORD,,
+radboy-0.0.540.dist-info/METADATA,sha256=QWxxnakIyz9_FmTy7RxACqg5sCCkVdwiVwPvxp5bdVo,1615
+radboy-0.0.540.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.540.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.540.dist-info/RECORD,,