radboy 0.0.737__py3-none-any.whl → 0.0.739__py3-none-any.whl

radboy/DB/db.py

@@ -5222,6 +5222,7 @@ class HealthLog(BASE,Template):
     def __init__(self,**kwargs):
         if 'DTOE' not in kwargs:
             self.DTOE=datetime.now()
+            
         for k in kwargs.keys():
             if k in [s.name for s in self.__table__.columns]:
                 setattr(self,k,kwargs.get(k))

radboy/HealthLog/HealthLog.py

@@ -39,10 +39,10 @@ class HealthLogUi:
 				lai=session.query(HealthLog).filter(and_(HealthLog.LongActingInsulinName!=None,HealthLog.LongActingInsulinTaken!=None))
 				lai=orderQuery(lai,HealthLog.DTOE,inverse=True).first()
 				if lai:
-					print(f"Long Acting Insulin : HowLongAgo({datetime.now()-lai.DTOE})")
+					print(f"{Fore.green_3b}Long Acting Insulin : HowLongAgo({Fore.sea_green_2}{datetime.now()-lai.DTOE}){Style.reset}")
 					num=0
 					view=[]
-					view.append(f"Name: '{lai.LongActingInsulinName}' Taken: {lai.LongActingInsulinTaken} Unit: {lai.LongActingInsulinUnitName} HLID: {lai.HLID} DTOE:{lai.DTOE}")
+					view.append(f"{Fore.green_3b}Name: {Fore.sea_green_2}'{lai.LongActingInsulinName}' {Fore.green_3b}Taken: {Fore.sea_green_2}{lai.LongActingInsulinTaken} {Fore.green_3b}Unit: {Fore.sea_green_2}{lai.LongActingInsulinUnitName} {Fore.green_3b}HLID: {Fore.sea_green_2}{lai.HLID} {Fore.green_3b}DTOE:{Fore.sea_green_2}{lai.DTOE}{Style.reset}")
 					msg=f"{'|'.join(view)}"
 					print(std_colorize(msg,num,ct))
 				else:
@@ -51,10 +51,10 @@ class HealthLogUi:
 				sai=session.query(HealthLog).filter(and_(HealthLog.ShortActingInsulinName!=None,HealthLog.ShortActingInsulinTaken!=None))
 				sai=orderQuery(sai,HealthLog.DTOE,inverse=True).first()
 				if sai:
-					print(f"Short Acting Insulin : HowLongAgo({datetime.now()-sai.DTOE})")
+					print(f"{Fore.green_3b}Short Acting Insulin : {Fore.green_3b}HowLongAgo({Fore.sea_green_2}{datetime.now()-sai.DTOE}){Style.reset}")
 					num=1
 					view=[]
-					view.append(f"Name: '{sai.ShortActingInsulinName}' Taken: {sai.ShortActingInsulinTaken} Unit: {sai.ShortActingInsulinUnitName} HLID: {sai.HLID} DTOE:{sai.DTOE}")
+					view.append(f"{Fore.green_3b}Name: {Fore.sea_green_2}'{sai.ShortActingInsulinName}' {Fore.green_3b}Taken: {Fore.sea_green_2}{sai.ShortActingInsulinTaken} {Fore.green_3b}Unit: {Fore.sea_green_2}{sai.ShortActingInsulinUnitName} {Fore.green_3b}HLID: {Fore.sea_green_2}{sai.HLID} {Fore.green_3b}DTOE:{Fore.sea_green_2}{sai.DTOE}{Style.reset}")
 
 					msg=f"{'|'.join(view)}"
 					print(std_colorize(msg,num,ct))
@@ -64,7 +64,7 @@ class HealthLogUi:
 				last_carb=session.query(HealthLog).filter(and_(HealthLog.CarboHydrateIntake!=None,HealthLog.EntryName!=None))
 				last_carb=orderQuery(last_carb,HealthLog.DTOE,inverse=True).first()
 				if last_carb:
-					print(f"CarboHydrateIntake : HowLongAgo({datetime.now()-last_carb.DTOE})")
+					print(f"{Fore.green_3b}CarboHydrateIntake : HowLongAgo({Fore.sea_green_2}{datetime.now()-last_carb.DTOE}){Style.reset}")
 					num=2					
 					view=[]
 					for x in last_carb.__table__.columns:
@@ -78,10 +78,10 @@ class HealthLogUi:
 				drug=session.query(HealthLog).filter(HealthLog.DrugQtyConsumed!=None)
 				drug=orderQuery(drug,HealthLog.DTOE,inverse=True).first()
 				if drug:
-					print(f"Last Drug Dose Taken : HowLongAgo({datetime.now()-drug.DTOE})")
+					print(f"{Fore.green_3b}Last Drug Dose Taken : HowLongAgo({Fore.sea_green_2}{datetime.now()-drug.DTOE}){Style.reset}")
 					num=3
 					view=[]
-					view.append(f"Name:{drug.EntryName} Barcode:{drug.EntryBarcode} Drug Name: '{drug.DrugConsumed}' Taken: {lai.DrugQtyConsumed} Unit: {drug.DrugQtyConsumedUnitName} HLID: {lai.HLID} DTOE:{lai.DTOE}")
+					view.append(f"{Fore.green_3b}Name:{Fore.sea_green_2}{drug.EntryName} {Fore.green_3b}Barcode:{Fore.sea_green_2}{drug.EntryBarcode} {Fore.green_3b}Drug Name: {Fore.sea_green_2}'{drug.DrugConsumed}' {Fore.green_3b}Taken: {Fore.sea_green_2}{lai.DrugQtyConsumed} {Fore.green_3b}Unit: {Fore.sea_green_2}{drug.DrugQtyConsumedUnitName} {Fore.green_3b}HLID: {Fore.sea_green_2}{lai.HLID} {Fore.green_3b}DTOE:{Fore.sea_green_2}{lai.DTOE}{Style.reset}")
 					msg=f"{'|'.join(view)}"
 					print(std_colorize(msg,num,ct))
 				else:
@@ -91,10 +91,10 @@ class HealthLogUi:
 				glucose=session.query(HealthLog).filter(and_(HealthLog.BloodSugar!=None,))
 				glucose=orderQuery(glucose,HealthLog.DTOE,inverse=True).first()
 				if glucose:
-					print(f"Blood Sugar : HowLongAgo({datetime.now()-glucose.DTOE})")
+					print(f"{Fore.green_3b}Blood Sugar : HowLongAgo({Fore.sea_green_2}{datetime.now()-glucose.DTOE})")
 					num=0
 					view=[]
-					view.append(f"Blood Sugar/Glucose No. : {glucose.BloodSugar} Unit:{glucose.BloodSugarUnitName} HLID: {glucose.HLID} DTOE: {glucose.DTOE}")
+					view.append(f"{Fore.green_3b}Blood Sugar/Glucose No. : {Fore.sea_green_2}{glucose.BloodSugar} {Fore.green_3b}Unit:{Fore.sea_green_2}{glucose.BloodSugarUnitName} {Fore.green_3b}HLID: {Fore.sea_green_2}{glucose.HLID} {Fore.green_3b}DTOE: {Fore.sea_green_2}{glucose.DTOE}{Style.reset}")
 
 					msg=f"{'|'.join(view)}"
 					print(std_colorize(msg,num,ct))
@@ -104,10 +104,10 @@ class HealthLogUi:
 				height=session.query(HealthLog).filter(and_(HealthLog.Height!=None,))
 				height=orderQuery(height,HealthLog.DTOE,inverse=True).first()
 				if height:
-					print(f"Height : HowLongAgo({datetime.now()-height.DTOE})")
+					print(f"{Fore.green_3b}Height : HowLongAgo({Fore.sea_green_2}{datetime.now()-height.DTOE})")
 					num=0
 					view=[]
-					view.append(f"Height : {height.Height} Unit:{height.HeightUnitName} HLID: {height.HLID} DTOE: {height.DTOE}")
+					view.append(f"{Fore.green_3b}Height : {Fore.sea_green_2}{height.Height} {Fore.green_3b}Unit:{Fore.sea_green_2}{height.HeightUnitName} {Fore.green_3b}HLID: {Fore.sea_green_2}{height.HLID} {Fore.green_3b}DTOE: {Fore.sea_green_2}{height.DTOE}{Style.reset}")
 
 					msg=f"{'|'.join(view)}"
 					print(std_colorize(msg,num,ct))
@@ -117,10 +117,10 @@ class HealthLogUi:
 				weight=session.query(HealthLog).filter(and_(HealthLog.Weight!=None,))
 				weight=orderQuery(weight,HealthLog.DTOE,inverse=True).first()
 				if weight:
-					print(f"Weight : HowLongAgo({datetime.now()-weight.DTOE})")
+					print(f"{Fore.green_3b}Weight : HowLongAgo({Fore.sea_green_2}{datetime.now()-weight.DTOE})")
 					num=0
 					view=[]
-					view.append(f"Weight : {weight.Weight} Unit:{weight.WeightUnitName} HLID: {weight.HLID} DTOE: {weight.DTOE}")
+					view.append(f"{Fore.green_3b}Weight : {Fore.sea_green_2}{weight.Weight} {Fore.green_3b}Unit:{Fore.sea_green_2}{weight.WeightUnitName} {Fore.green_3b}HLID: {Fore.sea_green_2}{weight.HLID} {Fore.green_3b}DTOE: {Fore.sea_green_2}{weight.DTOE}{Style.reset}")
 					msg=f"{'|'.join(view)}"
 					print(std_colorize(msg,num,ct))
 				else:
@@ -129,10 +129,10 @@ class HealthLogUi:
 				heartRate=session.query(HealthLog).filter(and_(HealthLog.HeartRate!=None,))
 				heartRate=orderQuery(heartRate,HealthLog.DTOE,inverse=True).first()
 				if heartRate:
-					print(f"Heart Rate : HowLongAgo({datetime.now()-heartRate.DTOE})")
+					print(f"{Fore.green_3b}Heart Rate : HowLongAgo({Fore.sea_green_2}{datetime.now()-heartRate.DTOE})")
 					num=0
 					view=[]
-					view.append(f"HeartRate : {heartRate.HeartRate} Unit:{heartRate.HeartRateUnitName} HLID: {heartRate.HLID} DTOE: {heartRate.DTOE}")
+					view.append(f"{Fore.green_3b}HeartRate : {Fore.sea_green_2}{heartRate.HeartRate} {Fore.green_3b}Unit:{Fore.sea_green_2}{heartRate.HeartRateUnitName} {Fore.green_3b}HLID: {Fore.sea_green_2}{heartRate.HLID} {Fore.green_3b}DTOE: {Fore.sea_green_2}{heartRate.DTOE}")
 					msg=f"{'|'.join(view)}"
 					print(std_colorize(msg,num,ct))
 				else:
@@ -387,6 +387,10 @@ class HealthLogUi:
 				'type':str(i.type).lower(),
 				} for i in hl.__table__.columns if str(i.name) not in excludes and str(i.name) in useColumns
 			}
+			fields['DTOE']={
+			'default':datetime.now(),
+			'type':'datetime',
+			}
 			if fields in [{},None]:
 				print(fields,"empty!")
 				return

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.737'
+VERSION='0.0.739'

{radboy-0.0.737.dist-info → radboy-0.0.739.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.737
+Version: 0.0.739
 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.737.dist-info → radboy-0.0.739.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=KI7Jmf3MX0Zng_YUvcjVKN2siyUOhaMAHQGzpPuX8KQ,41373
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=v9F7nMBQgulxaFrT6PoIC7P20PVHB1q4Dfzp9-G_BSw,17
+radboy/__init__.py,sha256=2LSVV09ampAjLPtQgPHSR0lxBGuStbr34SseANLRWAI,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
@@ -95,7 +95,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=X8ay-st-De9NgF2ZdVfKjD85lb12Kb7GHUl6jTsypyU,262827
+radboy/DB/db.py,sha256=pMJHs6-Pl341wDg1z-02FE0JdnQ__pJxbFh2F7_zi-k,262840
 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
@@ -135,7 +135,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=WAIPDMFceBqoVGbeiXTJTeCdUsi4SE16JlK-8fwuhjE,411907
+radboy/DB/__pycache__/db.cpython-313.pyc,sha256=824ZgO1MYbuSwxiKYAE470kJq730UpqPPtEZyW8o1B4,411907
 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
@@ -218,10 +218,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=QhnzBCauRjaR1fah0qTB0R5VqpyiliqtAQzVagUNflI,47121
+radboy/HealthLog/HealthLog.py,sha256=e7y_SaWM7-UqocbDhEQ7w4w008sQ9VDxN6SR1kxK0bo,48695
 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=-doD_xALYWmcKT_tSVY_9LpWu4vdoWB169p07eWfxEo,72671
+radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=CD0s5dSzjWUx8E3jyqV-ftqwqlvbOykeSm_pwvYI4Y0,81524
 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
@@ -406,7 +406,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=SLassoZXew4qGFkR_LfLjaCzJUHtpYwKJL2nbkKYPHU,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=PaIZBRuu1gvyzhyqVSC8PSEnjVpOwF-qfZcH_zgxQ_g,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
@@ -434,7 +434,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.737.dist-info/METADATA,sha256=5wpKzzK-gG6ipWAk8fwNjnbkLlhqge0VdQFmkdW-vMU,1891
-radboy-0.0.737.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.737.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.737.dist-info/RECORD,,
+radboy-0.0.739.dist-info/METADATA,sha256=VCsPjJlP2kQtoU7cf5IzpQEohzxQv4njCXMCikEuMes,1891
+radboy-0.0.739.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.739.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.739.dist-info/RECORD,,