radboy 0.0.772__py3-none-any.whl → 0.0.774__py3-none-any.whl

radboy/DB/ExerciseTracker.py

@@ -41,7 +41,7 @@ class Exercise(BASE,Template):
     __tablename__="Exercise"
     exid=Column(Integer,primary_key=True)
     Name=Column(String,default=f'Generic Exercise Name [{nanoid.generate()}]')
-    Note=Column(String,default='')
+    Note=Column(String,default=json.dumps({'completed':0}))
     Reps=Column(Integer,default=1) # 8 reps of 30 repcounts NAME
     RepCount=Column(Integer,default=30) #30 times rep
     CurrentRep=Column(Integer,default=0)
@@ -255,10 +255,6 @@ class ExerciseTracker:
                 'default':'',
                 'type':'string',
                 },
-            'Note':{
-                'default':'',
-                'type':'string',
-                },
             }
             routine=FormBuilder(data=data_r)
             while True:
@@ -280,10 +276,18 @@ class ExerciseTracker:
                         nt=gethpv(routine)
                         #print(nt)
                         nt+=1
-                        rts=Routine(Name=routine.get("Name"),Note=routine.get("Note"),exid=i.exid,precedence=nt,doe=doe,dtoe=dtoe,toe=toe)
+                        rts=Routine(Name=routine.get("Name"),Note=json.dumps({'completed':0}),exid=i.exid,precedence=nt,doe=doe,dtoe=dtoe,toe=toe)
                         session.add(rts)
                         session.commit()
+                        session.refresh(rts)
+                        '''
+                        self.clearRoutine(rts)
                         #print(gethpv(routine))
+                        rout[num].Note=json.dumps({'completed':0})
+                        session.commit()
+                        session.flush()
+                        session.refresh(rout[num])
+                        '''
                     else:
                         pass
     def reset_routine(self):
@@ -535,7 +539,7 @@ class ExerciseTracker:
                         name,note,exid=ex.Name,ex.Note,ex.exid
                     else:
                         name,note,exid="NotFound?","NotFound?","NotFound?"
-                    msg=f"{Fore.light_yellow}{num}/{Fore.light_red}{ct}{Style.reset}{Fore.light_steel_blue} -> {r.Name}  (roid={r.roid}) Exercise(Name='{name}',Note='{note}',exid='{exid}'){Style.reset}"
+                    msg=f"{Fore.light_yellow}{num}/{Fore.light_red}{ct}{Style.reset}{Fore.light_steel_blue} -> {r.Name}  (roid={r.roid},exid={exid}) Exercise(Name='{name}',Note='{note}',exid='{exid}'){Style.reset}"
                     print(msg)
                     if returnable:
                         lite.append(r.Name)
@@ -548,21 +552,25 @@ class ExerciseTracker:
 
     def useRoutine(self,reset_only=False,reset_note=False):
         try:
+            
             logMe=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Log a comment in HealthLog(hl[default=True/Yes])?",helpText="yes or no/boolean",data="boolean")
             if logMe is None:
                 return
             elif logMe in ['d',]:
                 logMe=True
-
+            
             start=datetime.now()
             rs=self.viewRoutine(returnable=True)
             if rs == None:
                 return
+
+           
             whichList=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Which Routine would you like to use?",helpText="first number of a line",data="list")
             if whichList in ['d']:
                 whichList=[]
             elif whichList in [None,]:
                 return
+            
             for which in whichList:
                 try:
                     which=int(which)
@@ -600,10 +608,10 @@ class ExerciseTracker:
                         
                         if reset_note:
                             for num, i in enumerate(rout):
-                                    rout[num].Note=json.dumps({'completed':0})
-                                    session.commit()
-                                    session.flush()
-                                    session.refresh(rout[num])
+                                rout[num].Note=json.dumps({'completed':0})
+                                session.commit()
+                                session.flush()
+                                session.refresh(rout[num])
                         if reset_only:
                             #resume
                             if logMe:
@@ -733,20 +741,27 @@ class ExerciseTracker:
         h=f'{Prompt.header.format(Fore=Fore,mode=mode,fieldname=fieldname,Style=Style)}'
         header='{Fore.grey_70}[{Fore.light_steel_blue}{mode}{Fore.medium_violet_red}@{Fore.light_green}{fieldname}{Fore.grey_70}]{Style.reset}{Fore.light_yellow} '
 
-        helpText=f'''
-        ne,NewExercise - create a new exercise
-        re,RemoveExercise - delete an exercise
-        se,SearchExercise - search for an exercise from it's Note,Name, or ID
-        ee,EditExercise - edit an exercise
-        nr,NewRoutine - a new routine of exercises
-        vr,ViewRoutines - show available routines
-        vrl,ViewRoutines - show available routines and their exercises as a list
-        a2r,add2routine - add an exercise to a routine specified by RID
-        ur,UseRoutine - use a set routine
-        rr,RemoveRoutine - delete a routine
-        cr,ClearRoutine - reset routine CurrentRep
-        su,summarize,Summarize - show the contents of a specified Routine
-        '''
+        helpText=f'''{Fore.light_green}Exercises{Fore.grey_70}
+    ** ne,NewExercise - create a new exercise
+    ** re,RemoveExercise - delete an exercise
+    ** se,SearchExercise - search for an exercise from it's Note,Name, or ID
+    ** ee,EditExercise - edit an exercise
+{Fore.dark_goldenrod}Routines{Fore.grey_70}
+    ** nr,NewRoutine - a new routine of exercises
+    ** vr,ViewRoutines - show available routines
+    ** vrl,ViewRoutines - show available routines and their exercises as a list
+    ** a2r,add2routine - add an exercise to a routine specified by RID
+    ** ur,UseRoutine - use a set routine
+    ** rr,RemoveRoutine - delete a routine
+    ** cr,ClearRoutine - reset routine CurrentRep
+    ** su,summarize,Summarize - show the contents of a specified Routine
+{Fore.orange_red_1}DANGER{Fore.grey_70}
+    ** rst rtn,reset routine,reset-routine - delete all routines {Fore.light_red}ONLY{Fore.grey_70}
+    ** rst ex,reset exercises,reset-exercises - delete all exercises {Fore.light_red}ONLY{Fore.grey_70}
+    ** rst a,reset all,reset-all - delete {Fore.dark_goldenrod}<{Fore.orange_red_1}<<{Fore.medium_violet_red}<<{Fore.light_cyan}Everything{Fore.medium_violet_red}>>{Fore.orange_red_1}>>{Fore.dark_goldenrod}> {Fore.cyan} in the ExerciseTracker!
+{Fore.light_salmon_1}WARNING{Fore.grey_70}
+    ignore '**' ; this is not part of the cmd; it's just a bullet point representation.
+{Style.reset}'''
         while True:
             doWhat=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{h} Do what?",helpText=helpText,data="string")
             if doWhat in [None,]:

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.772'
+VERSION='0.0.774'

{radboy-0.0.772.dist-info → radboy-0.0.774.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.772
+Version: 0.0.774
 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.772.dist-info → radboy-0.0.774.dist-info}/RECORD

@@ -5,12 +5,12 @@ radboy/Holidays.txt,sha256=y-JZPihh5iaWKxMIHNXD39yVuVmf1vMs4FdNDcg0f1Y,3114
 radboy/InventoryGlossary.txt,sha256=018-Yqca6DFb10jPdkUY-5qhkRlQN1k3rxoTaERQ-LA,91008
 radboy/RecordMyCodes.py,sha256=h30zoTqt-XLt_afDPlxMxBiKKwmKi3N-yAuldNCqXUo,41476
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=BLhIMypcB5cP5uyluwE94mNdUzTNq-KgIrf2MriA7qU,17
+radboy/__init__.py,sha256=V0Z55cz9XAelg5fs3RKFO1fNFpFmzZvWESHsmOfPBCc,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
 radboy/changelog.txt,sha256=_73e-OcHDecsK-eHEE45T84zHbUZ8Io3FzvLNwHPdoY,3714
-radboy/code.png,sha256=DvZ1QpLmaKcJwJM6HFD4YatBTi_mHp0h-fLZto47U-8,322
+radboy/code.png,sha256=gNzkHVCy0Lg18t2eB88jceaDZe_CEHyXYkJvlGqkRno,312
 radboy/db.csv,sha256=hpecu18LtCow5fH01queqWgqPByR628K7pLuEuLSuj4,19
 radboy/dictionary.txt,sha256=EJlEazI8RfTDX_Uzd6xnXLm9IjU5AEq6HVDwi42Y4_4,195680
 radboy/export.csv,sha256=YIU8c34enlknKMzKwzfQEN8e0mUdyW8m6O8GvgUQ9do,41015
@@ -82,7 +82,7 @@ radboy/DB/CoinCombo.py,sha256=NJfTmx3XYgS41zkAyyO2W6de1Mj3rWsCWqU4ikHfvJI,13604
 radboy/DB/DatePicker.py,sha256=B75mDtXQrkHRCpoU9TJsaBVvkK37ykMaJyaiqGOo4dM,18334
 radboy/DB/DisplayItemDb.py,sha256=uVvrNyFyBuKvrw-BEPXKYvfa-QWyFN5ahESi2l6vUUA,52046
 radboy/DB/EstimatedPayCalendarWorkSheet.txt,sha256=GOjRSmGxFoNTdAnpPe2kGv7CkXDrh0Mee01HslamGbo,17173
-radboy/DB/ExerciseTracker.py,sha256=4AbUREsuT998n656z_SzwwHga52psx-YNLKT9smu54U,37198
+radboy/DB/ExerciseTracker.py,sha256=hs_RG7YWFsu8KYkMe2PIKtTyxl9MzbnWXuTCXffF3K8,38219
 radboy/DB/LetterWriter.py,sha256=0B14GB-hJK2Xf_TFASriOELFygiI1LwkSb__R3tUiU0,2631
 radboy/DB/OrderedAndRxd.py,sha256=v_vrTOiTDhKqT5KErK6MOG_u4Nt7ug2MoLTHvAnm88M,19450
 radboy/DB/PayDay.py,sha256=H2kPGvBCDkMOz7lbxQhYtUt_oAInpxi37Q6MFrah98I,8710
@@ -114,7 +114,7 @@ radboy/DB/__pycache__/DatePicker.cpython-313.pyc,sha256=jV__j5ER1oshsenGPynR0UNH
 radboy/DB/__pycache__/DisplayItemDb.cpython-312.pyc,sha256=n2nRfavATZBSa7rBgH39pd11Ka-nUfGHVzr-R9KO7_Q,63121
 radboy/DB/__pycache__/DisplayItemDb.cpython-313.pyc,sha256=M4jujGXKVqYObZKQipamkTpw68YhEWLqBmywtPgnG-A,63715
 radboy/DB/__pycache__/ExerciseTracker.cpython-312.pyc,sha256=KzCmPhacS7t-70cpZM5tCnL8mBmRbA9dc4uuatdcQkI,34820
-radboy/DB/__pycache__/ExerciseTracker.cpython-313.pyc,sha256=E_inneFFK82vNIcR7CyRV6ev2f4eBuIqimjekjpY8y4,50734
+radboy/DB/__pycache__/ExerciseTracker.cpython-313.pyc,sha256=pOkECfk2hK6KDNErDER51_MlhqkWnrjw8YIbETQgEmE,52824
 radboy/DB/__pycache__/FormBuilder.cpython-312.pyc,sha256=p1o-5SMRL8OXP_XQ5liUpf-_EkvU8oQwg-BrTWVkcTY,5566
 radboy/DB/__pycache__/PrintLogging.cpython-312.pyc,sha256=pIAFqTi6OiQQORSc-oMH1zAbsdH7sY1TifxrN_QOvnU,148
 radboy/DB/__pycache__/Prompt.cpython-311.pyc,sha256=P2uPRpeqfLFtxieZ0JHBG3X_HZzWUCsFSLb_fpRqky0,6407
@@ -412,7 +412,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=0uVXYTnwTvJI3be5tuq6YnalPONI-NsGFP1j_F6ifdk,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=uxEntJnUBYhOKqQm-y_E3TZdMDarYYiePhWyPbTna2E,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
@@ -440,7 +440,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.772.dist-info/METADATA,sha256=AJcHUF3QSxngwzf-jH2spwOB7by8-dRLihd-LNd4fVs,1920
-radboy-0.0.772.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.772.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.772.dist-info/RECORD,,
+radboy-0.0.774.dist-info/METADATA,sha256=xj_v6ZndYz4-kBUd8lcSVvOvYy53j_7i8SFB7nCotTE,1920
+radboy-0.0.774.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.774.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.774.dist-info/RECORD,,