radboy 0.0.772__tar.gz → 0.0.774__tar.gz

{radboy-0.0.772 → radboy-0.0.774}/PKG-INFO

@@ -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.774/STDOUT.TXT

@@ -0,0 +1,21 @@
+#USER INPUT# -> :"et"
+#USER INPUT# -> :"nr"
+#USER INPUT# -> :"test4"
+#USER INPUT# -> :"ff"
+#USER INPUT# -> :""
+#USER INPUT# -> :"1"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"ur"
+#USER INPUT# -> :""
+#USER INPUT# -> :"5"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"0.0.774"

{radboy-0.0.772 → radboy-0.0.774}/pyproject.toml

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

{radboy-0.0.772 → radboy-0.0.774}/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-0.0.774/radboy/__init__.py

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

{radboy-0.0.772 → radboy-0.0.774}/radboy.egg-info/PKG-INFO

@@ -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 → radboy-0.0.774}/setup.py

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

radboy-0.0.772/STDOUT.TXT

@@ -1,17 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"et"
-#USER INPUT# -> :"rst a"
-#USER INPUT# -> :"y"
-#USER INPUT# -> :"now"
-#USER INPUT# -> :"9698493385"
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"today"
-#USER INPUT# -> :"9698493385"
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"se"
-#USER INPUT# -> :""
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.772"

radboy-0.0.772/radboy/__init__.py

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