radboy 0.0.534__py3-none-any.whl → 0.0.536__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of radboy might be problematic. Click here for more details.
- radboy/DB/ExerciseTracker.py +28 -4
- radboy/DB/__pycache__/ExerciseTracker.cpython-313.pyc +0 -0
- radboy/HealthLog/HealthLog.py +6 -0
- radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc +0 -0
- radboy/__init__.py +1 -1
- radboy/__pycache__/__init__.cpython-313.pyc +0 -0
- {radboy-0.0.534.dist-info → radboy-0.0.536.dist-info}/METADATA +1 -1
- {radboy-0.0.534.dist-info → radboy-0.0.536.dist-info}/RECORD +10 -10
- {radboy-0.0.534.dist-info → radboy-0.0.536.dist-info}/WHEEL +0 -0
- {radboy-0.0.534.dist-info → radboy-0.0.536.dist-info}/top_level.txt +0 -0
radboy/DB/ExerciseTracker.py
CHANGED
|
@@ -422,6 +422,11 @@ class ExerciseTracker:
|
|
|
422
422
|
session.flush()
|
|
423
423
|
session.refresh(rout[num])
|
|
424
424
|
if reset_only:
|
|
425
|
+
#resume
|
|
426
|
+
if logMe:
|
|
427
|
+
hl=HealthLog(Comments=f"{exercise.Name}:Exercise({i})\t\nResetting! {datetime.now().ctime()}")
|
|
428
|
+
session.add(hl)
|
|
429
|
+
session.commit()
|
|
425
430
|
continue
|
|
426
431
|
#return
|
|
427
432
|
total_dur=timedelta(seconds=0)
|
|
@@ -431,19 +436,28 @@ class ExerciseTracker:
|
|
|
431
436
|
for num, i in enumerate(rout):
|
|
432
437
|
if completed_reps > total_reps:
|
|
433
438
|
completed=ct
|
|
439
|
+
if logMe:
|
|
440
|
+
hl=HealthLog(Comments=f"{exercise.Name}:Exercise({i})\t\nCompleted Stage 2! {datetime.now().ctime()}")
|
|
441
|
+
session.add(hl)
|
|
442
|
+
session.commit()
|
|
434
443
|
break
|
|
435
444
|
exercise=session.query(Exercise).filter(Exercise.exid==i.exid).first()
|
|
436
445
|
exercise.cdt=datetime.now()
|
|
437
|
-
|
|
438
|
-
hl=HealthLog(Comments=f"{exercise.Name}:exid:{i}\nstarted! {datetime.now().ctime()}")
|
|
439
|
-
session.add(hl)
|
|
440
|
-
session.commit()
|
|
446
|
+
|
|
441
447
|
if exercise.CurrentRep < exercise.Reps:
|
|
442
448
|
setattr(exercise,"CurrentRep",getattr(exercise,"CurrentRep")+1)
|
|
449
|
+
if logMe:
|
|
450
|
+
hl=HealthLog(Comments=f"{exercise.Name}:Exercise({i})\t\nstarted! {datetime.now().ctime()}")
|
|
451
|
+
session.add(hl)
|
|
452
|
+
session.commit()
|
|
443
453
|
else:
|
|
444
454
|
setattr(exercise,"CurrentRep",getattr(exercise,"CurrentRep"))
|
|
445
455
|
completed+=1
|
|
446
456
|
#completed_reps+=1
|
|
457
|
+
if logMe:
|
|
458
|
+
hl=HealthLog(Comments=f"{exercise.Name}:Exercise({i})\t\nResuming! {datetime.now().ctime()}")
|
|
459
|
+
session.add(hl)
|
|
460
|
+
session.commit()
|
|
447
461
|
continue
|
|
448
462
|
#os.system("clear")
|
|
449
463
|
session.commit()
|
|
@@ -473,6 +487,10 @@ class ExerciseTracker:
|
|
|
473
487
|
#print(completed_reps)
|
|
474
488
|
completed_reps+=1
|
|
475
489
|
if old > completed_reps:
|
|
490
|
+
if logMe:
|
|
491
|
+
hl=HealthLog(Comments=f"{exercise.Name}:Exercise({i})\t\nCompleted Stage 1! {datetime.now().ctime()}")
|
|
492
|
+
session.add(hl)
|
|
493
|
+
session.commit()
|
|
476
494
|
continue
|
|
477
495
|
for num2, i in enumerate(rout):
|
|
478
496
|
rout[num2].Note=json.dumps({'completed':completed_reps,'Total Duration':str(total_dur)})
|
|
@@ -497,6 +515,10 @@ class ExerciseTracker:
|
|
|
497
515
|
session.add(rd)
|
|
498
516
|
session.commit()
|
|
499
517
|
session.refresh(rd)
|
|
518
|
+
if logMe:
|
|
519
|
+
hl=HealthLog(Comments=f"{exercise.Name}:Exercise({i})\t\nCompleted Stage 3! {datetime.now().ctime()}")
|
|
520
|
+
session.add(hl)
|
|
521
|
+
session.commit()
|
|
500
522
|
print(rd)
|
|
501
523
|
except Exception as e:
|
|
502
524
|
print(e)
|
|
@@ -565,5 +587,7 @@ class ExerciseTracker:
|
|
|
565
587
|
self.removeRoutine()
|
|
566
588
|
elif doWhat.lower() in ['cr','ClearRoutine'.lower()]:
|
|
567
589
|
self.clearRoutine()
|
|
590
|
+
elif doWhat.lower() in ['hl','healthlog'.lower()]:
|
|
591
|
+
HealthLogUi()
|
|
568
592
|
elif doWhat.lower() in "su,summarize".split(","):
|
|
569
593
|
self.summarize()
|
|
Binary file
|
radboy/HealthLog/HealthLog.py
CHANGED
|
@@ -24,6 +24,7 @@ from colored import Style,Fore
|
|
|
24
24
|
import json,sys,math,re,calendar
|
|
25
25
|
import plotext as plt
|
|
26
26
|
import pint_pandas
|
|
27
|
+
import radboy.DB.ExerciseTracker as ET
|
|
27
28
|
|
|
28
29
|
class HealthLogUi:
|
|
29
30
|
def edit_hlid(self):
|
|
@@ -592,6 +593,11 @@ class HealthLogUi:
|
|
|
592
593
|
'desc':'list blood sugars',
|
|
593
594
|
'exec':lambda self=self:self.showAllField(fields=['BloodSugar','BloodSugarUnitName'],not_none=['BloodSugar',])
|
|
594
595
|
},
|
|
596
|
+
'et':{
|
|
597
|
+
'cmds':['et','exercise tracker','exrcse trckr',],
|
|
598
|
+
'desc':'exercise tracker short cut',
|
|
599
|
+
'exec':ET.ExerciseTracker
|
|
600
|
+
},
|
|
595
601
|
'lsdrug':{
|
|
596
602
|
'cmds':['ls drug','ls dg','list drug','lsdrug','lsdrg'],
|
|
597
603
|
'desc':'list drug data',
|
|
Binary file
|
radboy/__init__.py
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
VERSION='0.0.
|
|
1
|
+
VERSION='0.0.536'
|
|
Binary file
|
|
@@ -5,7 +5,7 @@ radboy/Holidays.txt,sha256=y-JZPihh5iaWKxMIHNXD39yVuVmf1vMs4FdNDcg0f1Y,3114
|
|
|
5
5
|
radboy/InventoryGlossary.txt,sha256=018-Yqca6DFb10jPdkUY-5qhkRlQN1k3rxoTaERQ-LA,91008
|
|
6
6
|
radboy/RecordMyCodes.py,sha256=Lt2reA6xchq3U7Y08DvkrHboZ25i1ts7X2E9gSIwcVg,41101
|
|
7
7
|
radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
|
|
8
|
-
radboy/__init__.py,sha256=
|
|
8
|
+
radboy/__init__.py,sha256=HMmMdqnHyQRECgm7LLjt9NT5BFZq9ftzm1gweiCwT5Q,17
|
|
9
9
|
radboy/api_key,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
10
10
|
radboy/case-export-2024-05-14-13-10-00.672971.xlsx,sha256=Wd592d_VLFmfUI9KKKSVjNwjV91euc1T7ATyvwvUhlg,5431
|
|
11
11
|
radboy/case-export-2024-05-14-13-13-22.540614.xlsx,sha256=OnGrhmScHfGp_mVaWW-LNMsqrQgyZDpiU3wV-2s3U5Q,5556
|
|
@@ -80,7 +80,7 @@ radboy/DB/CoinCombo.py,sha256=NJfTmx3XYgS41zkAyyO2W6de1Mj3rWsCWqU4ikHfvJI,13604
|
|
|
80
80
|
radboy/DB/DatePicker.py,sha256=6eNjmryFWPpzrRYmI418UwSGin3XpJlL52h8cauanbY,18004
|
|
81
81
|
radboy/DB/DisplayItemDb.py,sha256=uVvrNyFyBuKvrw-BEPXKYvfa-QWyFN5ahESi2l6vUUA,52046
|
|
82
82
|
radboy/DB/EstimatedPayCalendarWorkSheet.txt,sha256=GOjRSmGxFoNTdAnpPe2kGv7CkXDrh0Mee01HslamGbo,17173
|
|
83
|
-
radboy/DB/ExerciseTracker.py,sha256=
|
|
83
|
+
radboy/DB/ExerciseTracker.py,sha256=OS9i8jGIZPj-6m1bB0-eKNHQ6vf2iv_AYPEc0s4bkBM,27809
|
|
84
84
|
radboy/DB/PayDay.py,sha256=H2kPGvBCDkMOz7lbxQhYtUt_oAInpxi37Q6MFrah98I,8710
|
|
85
85
|
radboy/DB/PayModels.py,sha256=hjwWxP7PL33hmfzQl5YTf0HqzaMxXJxFknPdxFJXJc8,3499
|
|
86
86
|
radboy/DB/PrintLogging.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -103,7 +103,7 @@ radboy/DB/__pycache__/DatePicker.cpython-313.pyc,sha256=mvdR-dzPS3X6tMFBDaMUoxIV
|
|
|
103
103
|
radboy/DB/__pycache__/DisplayItemDb.cpython-312.pyc,sha256=n2nRfavATZBSa7rBgH39pd11Ka-nUfGHVzr-R9KO7_Q,63121
|
|
104
104
|
radboy/DB/__pycache__/DisplayItemDb.cpython-313.pyc,sha256=M4jujGXKVqYObZKQipamkTpw68YhEWLqBmywtPgnG-A,63715
|
|
105
105
|
radboy/DB/__pycache__/ExerciseTracker.cpython-312.pyc,sha256=KzCmPhacS7t-70cpZM5tCnL8mBmRbA9dc4uuatdcQkI,34820
|
|
106
|
-
radboy/DB/__pycache__/ExerciseTracker.cpython-313.pyc,sha256=
|
|
106
|
+
radboy/DB/__pycache__/ExerciseTracker.cpython-313.pyc,sha256=OhUi666CCM0I4Ga3dri0EdStPpG-b2ea7BfTfLY3ot8,37578
|
|
107
107
|
radboy/DB/__pycache__/FormBuilder.cpython-312.pyc,sha256=p1o-5SMRL8OXP_XQ5liUpf-_EkvU8oQwg-BrTWVkcTY,5566
|
|
108
108
|
radboy/DB/__pycache__/PrintLogging.cpython-312.pyc,sha256=pIAFqTi6OiQQORSc-oMH1zAbsdH7sY1TifxrN_QOvnU,148
|
|
109
109
|
radboy/DB/__pycache__/Prompt.cpython-311.pyc,sha256=P2uPRpeqfLFtxieZ0JHBG3X_HZzWUCsFSLb_fpRqky0,6407
|
|
@@ -209,10 +209,10 @@ radboy/GeoTools/__pycache__/GeoClass.cpython-313.pyc,sha256=eZ6hpLKoic1XCb7BKKg-
|
|
|
209
209
|
radboy/GeoTools/__pycache__/OSMClass.cpython-312.pyc,sha256=5RoT8_wiI8R7yb_B9FWIC7mALdGNoqyWtkzsjM2pbh0,40387
|
|
210
210
|
radboy/GeoTools/__pycache__/__init__.cpython-312.pyc,sha256=Y7Xtrzwm44-xuY_4NK8aDjYfVmXIzUFWOyexJu9le8A,1238
|
|
211
211
|
radboy/GeoTools/__pycache__/__init__.cpython-313.pyc,sha256=-bk9eEIxWZgHYZHtNJbrpubDRWkbdYNkGr5J7sVhyIE,1238
|
|
212
|
-
radboy/HealthLog/HealthLog.py,sha256=
|
|
212
|
+
radboy/HealthLog/HealthLog.py,sha256=coXbXDOyaaQ_QD5HQFnSgzJSc-9Tz2GViAeKDO7MHO4,29209
|
|
213
213
|
radboy/HealthLog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
214
214
|
radboy/HealthLog/__pycache__/HealthLog.cpython-312.pyc,sha256=hTo4o7jo9L2yqPZgzuKUw_kon_PVcCuTRguELTuLrIo,27946
|
|
215
|
-
radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=
|
|
215
|
+
radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=sEbok43kdRXa7dSOUeyz0MK490xQwhY0pNbBHF2oFG8,46867
|
|
216
216
|
radboy/HealthLog/__pycache__/__init__.cpython-312.pyc,sha256=yZrYKBk31pGSjCRqmqzpX409iw-muC1zsNO2ObqkGlY,272
|
|
217
217
|
radboy/HealthLog/__pycache__/__init__.cpython-313.pyc,sha256=cqdZbEJKq9XVoVqDAwsW0pwwBBGSerJNWGlST3YVR3g,151
|
|
218
218
|
radboy/InListRestore/ILR.py,sha256=s8fbbHLKQSVJX1VaeyGE-vdIUGBEbOPX29kRIG2j2WY,16847
|
|
@@ -397,7 +397,7 @@ radboy/__pycache__/Run.cpython-311.pyc,sha256=G_UEfMtkLRjR6ZpGA_BJzGenuaCcP469Y9
|
|
|
397
397
|
radboy/__pycache__/Run.cpython-312.pyc,sha256=v4xolc3mHyla991XhpYBUbBHYT0bnJ1gE-lkFoQ4GFA,241
|
|
398
398
|
radboy/__pycache__/__init__.cpython-311.pyc,sha256=R-DVbUioMOW-Fnaq7FpT5F1a5p0q3b_RW-HpLRArCAY,242
|
|
399
399
|
radboy/__pycache__/__init__.cpython-312.pyc,sha256=FsFzLXOlTK8_7ixoPZzakkR8Wibt-DvXLFh-oG2QlPw,164
|
|
400
|
-
radboy/__pycache__/__init__.cpython-313.pyc,sha256=
|
|
400
|
+
radboy/__pycache__/__init__.cpython-313.pyc,sha256=A1mHYQXBlchxIYynC-38IY1YfkGI5Uia8OP4qWYFJ4E,165
|
|
401
401
|
radboy/__pycache__/__init__.cpython-39.pyc,sha256=D48T6x6FUeKPfubo0sdS_ZUut3FmBvPMP7qT6rYBZzU,275
|
|
402
402
|
radboy/__pycache__/possibleCode.cpython-311.pyc,sha256=zFiHyzqD8gUnIWu4vtyMYIBposiRQqaRXfcT_fOl4rU,20882
|
|
403
403
|
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
|
|
|
422
422
|
radboy/tkGui/__pycache__/BeginnersLuck.cpython-311.pyc,sha256=xLQOnV1wuqHGaub16mPX0dDMGU9ryCeLtNz5e517_GE,3004
|
|
423
423
|
radboy/tkGui/__pycache__/Review.cpython-311.pyc,sha256=wKq24iM6Xe2OampgZ7-8U6Nvmgs2y-qWOrGwtWhc75k,4047
|
|
424
424
|
radboy/tkGui/__pycache__/__init__.cpython-311.pyc,sha256=BX7DBn5qbvKTvlrKOP5gzTBPBTeTgSMjBW6EMl7N8e0,230
|
|
425
|
-
radboy-0.0.
|
|
426
|
-
radboy-0.0.
|
|
427
|
-
radboy-0.0.
|
|
428
|
-
radboy-0.0.
|
|
425
|
+
radboy-0.0.536.dist-info/METADATA,sha256=f2B_tVaTChH1-Ii6Ro-dbGujoHvcZb2TCyT0A8ZwhxY,1615
|
|
426
|
+
radboy-0.0.536.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
427
|
+
radboy-0.0.536.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
|
|
428
|
+
radboy-0.0.536.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|