radboy 0.0.536__tar.gz → 0.0.538__tar.gz

{radboy-0.0.536 → radboy-0.0.538}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.536
+Version: 0.0.538
 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.538/STDOUT.TXT

@@ -0,0 +1,15 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"ph"
+#USER INPUT# -> :"use"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"esa"
+#USER INPUT# -> :"sas"
+#USER INPUT# -> :"c4"
+#USER INPUT# -> :"esu"
+#USER INPUT# -> :"sas"
+#USER INPUT# -> :"c4"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.538"

{radboy-0.0.536 → radboy-0.0.538}/pyproject.toml

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

{radboy-0.0.536 → radboy-0.0.538}/radboy/DB/db.py

@@ -763,7 +763,7 @@ class EntryExtras:
     def __neg__(self):
         return -self.Price
 
-def std_colorize(m,n,c,start=f"[DB]{Back.grey_27}{Fore.pale_turquoise_1} Start {'*'*(os.get_terminal_size().columns-(len(Fore.pale_turquoise_1)+(len(Fore.grey_27)*2)+len(Style.reset)))}{Style.reset}\n",end=f"\n{Back.grey_50}{Fore.dark_red_1}{'-'*(os.get_terminal_size().columns-(len(Fore.dark_red_1)+(len(Fore.grey_50)*2)+len(Style.reset)))} Stop {Style.reset}"):
+def std_colorize(m,n,c,start=f"[DB]{Back.grey_11}{Fore.pale_turquoise_1} Start {'*'*(os.get_terminal_size().columns-(len(Fore.pale_turquoise_1)+(len(Back.grey_11)*2)+len(Style.reset)))}{Style.reset}\n",end=f"\n{Back.grey_11}{Fore.light_red}{'-'*(os.get_terminal_size().columns-(len(Fore.light_red)+(len(Back.grey_11)*2)+len(Style.reset)))} Stop {Style.reset}"):
         if ((n % 2) != 0) and n > 0:
             msg=f'{start}{Fore.cyan}{n}/{Fore.light_yellow}{n+1}{Fore.light_red} of {c} {Fore.dark_goldenrod}{m}{Style.reset}{end}'
         else:
@@ -4535,6 +4535,7 @@ class HistoryUi:
     {Fore.light_steel_blue}cmds are order ascending and grouped by cmd to reduce output to screen with too many results{Style.reset}
         {Fore.dark_goldenrod}select,slct,s,use,u{Fore.green_yellow} - select a cmd from history to use{Style.reset}
         {Fore.dark_goldenrod}rm last,rm,r,del{Fore.green_yellow} - delete a cmd from history{Style.reset}
+        {Fore.dark_goldenrod}'rm last ngp','rmngp','rngp','delngp' - {Fore.light_yellow}delete a cmd from history showing everything{Style.reset}
         {Fore.dark_goldenrod}show,sa,show all{Fore.green_yellow} - show all history{Style.reset}
         {Fore.dark_goldenrod}show_ngb,sa_ngb,show allngb{Fore.green_yellow} - show all history without group by cmd{Style.reset}
         {Fore.dark_goldenrod}ca,clear all,clear_all{Fore.green_yellow} - clear all cmds from PromptHistory{Style.reset}
@@ -4554,14 +4555,16 @@ class HistoryUi:
                 self.fixtable()
             elif doWhat in ['select','slct','s','use','u']:
                 with Session(ENGINE) as session:
-                    results=session.query(PH).order_by(PH.dtoe.asc()).group_by(PH.cmd).all()
+                    results=session.query(PH).group_by(PH.cmd)
+                    results=orderQuery(results,PH.dtoe,inverse=True)
+                    results=results.all()
                     ct=len(results)
                     if ct < 1:
                         print("Nothing in History!")
                         continue
                     for num,i in enumerate(results):
-                        msg=f'''{Fore.light_green}{num}{Fore.light_magenta}/{num+1} of {Fore.orange_red_1}{ct}{Style.reset} -> {i.cmd}|{i.dtoe}'''
-                        print(msg)
+                        msg=f'''{i.cmd}|{i.dtoe}'''
+                        print(std_colorize(msg,num,ct))
                     which=Prompt.__init2__(self,func=FormBuilderMkText,ptext=f"{h} Use which {Fore.light_green}command?{Fore.light_yellow}",helpText=master_help,data="integer")
                     if which in [None,]:
                         continue
@@ -4574,14 +4577,51 @@ class HistoryUi:
                             print(e)
             elif doWhat in ['rm last','rm','r','del']:
                 with Session(ENGINE) as session:
-                    results=session.query(PH).order_by(PH.dtoe.asc()).group_by(PH.cmd).all()
+                    results=session.query(PH).group_by(PH.cmd)
+                    results=orderQuery(results,PH.dtoe,inverse=True)
+                    results=results.all()
                     ct=len(results)
                     if ct < 1:
                         print("Nothing in History!")
                         continue
                     for num,i in enumerate(results):
-                        msg=f'''{Fore.light_green}{num}{Fore.light_magenta}/{num+1} of {Fore.orange_red_1}{ct}{Style.reset} -> {i.cmd}|{i.dtoe}'''
-                        print(msg)
+                        msg=f'''{i.cmd}|{i.dtoe}'''
+                        print(std_colorize(msg,num,ct))
+                    which=Prompt.__init2__(self,func=FormBuilderMkText,ptext=f"{h} Delete which {Fore.light_green}command?{Fore.light_yellow}",helpText=master_help,data="integer")
+                    if which in [None,]:
+                        continue
+                    elif which in ['d',]:
+                        continue
+                    else:
+                        try:
+                            if which < 0:
+                                index=which*-1
+                                index-=1
+                                rmall=session.query(PH).filter(PH.cmd==results[index].cmd).all()
+                                for num,i in enumerate(rmall):
+                                    session.delete(i)
+                                    if num%1000==0:
+                                        session.commit()
+                                session.commit()
+                            else:
+                                session.delete(results[which])
+                                session.commit()
+                                session.flush()
+                            self.cmd=None
+                        except Exception as e:
+                            print(e)
+            elif doWhat in ['rm last ngp','rmngp','rngp','delngp']:
+                with Session(ENGINE) as session:
+                    results=session.query(PH)
+                    results=orderQuery(results,PH.dtoe,inverse=True)
+                    results=results.all()
+                    ct=len(results)
+                    if ct < 1:
+                        print("Nothing in History!")
+                        continue
+                    for num,i in enumerate(results):
+                        msg=f'''{i.cmd}|{i.dtoe}'''
+                        print(std_colorize(msg,num,ct))
                     which=Prompt.__init2__(self,func=FormBuilderMkText,ptext=f"{h} Delete which {Fore.light_green}command?{Fore.light_yellow}",helpText=master_help,data="integer")
                     if which in [None,]:
                         continue
@@ -4607,24 +4647,28 @@ class HistoryUi:
                             print(e)
             elif doWhat in ['show','sa','show all']:
                 with Session(ENGINE) as session:
-                    results=session.query(PH).order_by(PH.dtoe.asc()).group_by(PH.cmd).all()
+                    results=session.query(PH).group_by(PH.cmd)
+                    results=orderQuery(results,PH.dtoe,inverse=True)
+                    results=results.all()
                     ct=len(results)
                     if ct < 1:
                         print("Nothing in History!")
                         continue
                     for num,i in enumerate(results):
-                        msg=f'''{Fore.light_green}{num}{Fore.light_magenta}/{num+1} of {Fore.orange_red_1}{ct}{Style.reset} -> {i.cmd}|{i.dtoe}|{i.dtoe+timedelta(seconds=i.ageLimit)}'''
-                        print(msg)
+                        msg=f'''{i.cmd}|{i.dtoe}|{i.dtoe+timedelta(seconds=i.ageLimit)}'''
+                        print(std_colorize(msg,num,ct))
             elif doWhat in ['show_ngb','sa_ngb','show all ngb']:
                 with Session(ENGINE) as session:
-                    results=session.query(PH).order_by(PH.dtoe.asc()).all()
+                    results=session.query(PH)
+                    results=orderQuery(results,PH.dtoe,inverse=True)
+                    results=results.all()
                     ct=len(results)
                     if ct < 1:
                         print("Nothing in History!")
                         continue
                     for num,i in enumerate(results):
-                        msg=f'''{Fore.light_green}{num}{Fore.light_magenta}/{num+1} of {Fore.orange_red_1}{ct}{Style.reset} -> {i.cmd}|{i.dtoe}|{i.dtoe+timedelta(seconds=i.ageLimit)}'''
-                        print(msg)
+                        msg=f'''{i.cmd}|{i.dtoe}|{i.dtoe+timedelta(seconds=i.ageLimit)}'''
+                        print(std_colorize(msg,num,ct))
             elif doWhat.lower() in ['co','clean old','clean_old']:
                 self.clean_old()
             elif doWhat in ['ca','clear all','clear_all']:
@@ -4640,7 +4684,10 @@ class HistoryUi:
                     search=Prompt.__init2__(self,func=FormBuilderMkText,ptext=f"{h} What cmd are you looking for?",helpText="what was in the command text",data="string")
                     if search in [None,'d']:
                         continue
-                    results=session.query(PH).order_by(PH.dtoe.asc()).group_by(PH.cmd).filter(PH.cmd.icontains(search)).all()
+                    results=session.query(PH).group_by(PH.cmd)
+                    results=orderQuery(results,PH.dtoe,inverse=True)
+                    results=results.filter(PH.cmd.icontains(search))
+                    results=results.all()
                     ct=len(results)
                     if ct < 1:
                         print("Nothing in History!")
@@ -4649,8 +4696,8 @@ class HistoryUi:
                     mode='PromptHistory'
                     h=f'{Prompt.header.format(Fore=Fore,mode=mode,fieldname=fieldname,Style=Style)}'
                     for num,i in enumerate(results):
-                        msg=f'''{Fore.light_green}{num}{Fore.light_magenta}/{num+1} of {Fore.orange_red_1}{ct}{Style.reset} -> {i.cmd}|{i.dtoe}'''
-                        print(msg)
+                        msg=f'''{i.cmd}|{i.dtoe}'''
+                        print(std_colorize(msg,num,ct))
                     which=Prompt.__init2__(self,func=FormBuilderMkText,ptext=f"{h} Use which {Fore.light_green}command?{Fore.light_yellow}",helpText=master_help,data="integer")
                     if which in [None,]:
                         continue
@@ -4669,14 +4716,16 @@ class HistoryUi:
                     search=Prompt.__init2__(self,func=FormBuilderMkText,ptext=f"{h} What cmd are you looking for?",helpText="what was in the command text; this will only remove the last used, if there is another inn history it will need to be removed as well, or just use ca",data="string",noHistory=False)
                     if search in [None,'d']:
                         continue
-                    results=session.query(PH).order_by(PH.dtoe.asc()).group_by(PH.cmd).filter(PH.cmd.icontains(search)).all()
+                    results=session.query(PH).group_by(PH.cmd)
+                    results=orderQuery(results,PH.dtoe,inverse=True)
+                    results=results.filter(PH.cmd.icontains(search)).all()
                     ct=len(results)
                     if ct < 1:
                         print("Nothing in History!")
                         continue
                     for num,i in enumerate(results):
-                        msg=f'''{Fore.light_green}{num}{Fore.light_magenta}/{num+1} of {Fore.orange_red_1}{ct}{Style.reset} -> {i.cmd}|{i.dtoe}'''
-                        print(msg)
+                        msg=f'''{i.cmd}|{i.dtoe}'''
+                        print(std_colorize(msg,num,ct))
                     which=Prompt.__init2__(self,func=FormBuilderMkText,ptext=f"{h} Delete which {Fore.light_green}command?{Fore.light_yellow}",helpText=master_help,data="integer")
                     if which in [None,]:
                         continue

{radboy-0.0.536 → radboy-0.0.538}/radboy/HealthLog/HealthLog.py

@@ -160,6 +160,13 @@ class HealthLogUi:
 				return
 			if 'LongActingInsulinName' in useColumns or 'ShortActingInsulinName' in useColumns:
 				def searchNames(code):
+					if code is None:
+						if 'LongActingInsulinName' in useColumns:
+							return 'Long Acting Insuline Unspecificied - see comments'
+						elif 'ShortActingInsulinName' in useColumns:
+							return 'Short Acting Insulin Unspecificied - see comments'
+						else:
+							return 'see comments'
 					with Session(ENGINE) as session:
 						query=session.query(Entry)
 						filters=[
@@ -174,6 +181,7 @@ class HealthLogUi:
 							print(msg)
 							return code
 						htext=[]
+						print(f"{Fore.orange_red_1}Getting Results({Fore.light_green}{ct}{Fore.orange_red_1}) for Display!{Style.reset}")
 						for num,i in enumerate(results):
 							msg=f"{Fore.light_cyan}{num}/{Fore.light_magenta}{num+1} of {Fore.light_red}{ct} {Fore.medium_violet_red} -> {i.seeShort()}"
 							htext.append(msg)

radboy-0.0.538/radboy/__init__.py

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

{radboy-0.0.536 → radboy-0.0.538}/radboy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.536
+Version: 0.0.538
 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.536 → radboy-0.0.538}/setup.py

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

radboy-0.0.536/STDOUT.TXT

@@ -1,14 +0,0 @@
-#USER INPUT# -> :"hl"
-#USER INPUT# -> :"et"
-#USER INPUT# -> :"hl"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"et"
-#USER INPUT# -> :"hl"
-#USER INPUT# -> :"et"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"0.0.536"

radboy-0.0.536/radboy/__init__.py

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