radboy 0.0.536__py3-none-any.whl → 0.0.538__py3-none-any.whl

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/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/__init__.py

@@ -1 +1 @@
-VERSION='0.0.536'
+VERSION='0.0.538'

{radboy-0.0.536.dist-info → radboy-0.0.538.dist-info}/METADATA

@@ -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.dist-info → radboy-0.0.538.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=Lt2reA6xchq3U7Y08DvkrHboZ25i1ts7X2E9gSIwcVg,41101
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=HMmMdqnHyQRECgm7LLjt9NT5BFZq9ftzm1gweiCwT5Q,17
+radboy/__init__.py,sha256=mqsjW9lPulzN_YJJyctppYQ4rUnaWCk7MuIHEwA3bTc,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
@@ -91,7 +91,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=iJbK-tSBb9l6lUiggfaU5MwrflMV1uqVmzDsTKYfgSA,247726
+radboy/DB/db.py,sha256=b47WCPLuTztsyeqhL3tguCvgg0ngRCygAe1zBBHNmzA,249742
 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
@@ -126,7 +126,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=ynMtzt_Ou0tSLO9RBVFAjL_8f83F_tp8KWRu1HOmpEM,393706
+radboy/DB/__pycache__/db.cpython-313.pyc,sha256=FHc5BCSxQOBWuGWGR2Pza2Q_xFE1EazGt3ix8NQHzq0,394073
 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
@@ -209,10 +209,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=coXbXDOyaaQ_QD5HQFnSgzJSc-9Tz2GViAeKDO7MHO4,29209
+radboy/HealthLog/HealthLog.py,sha256=2Yir-gjhCLp0JT4Df0akgc8fbLPFoITjGeJ1JwQyoLU,29623
 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=sEbok43kdRXa7dSOUeyz0MK490xQwhY0pNbBHF2oFG8,46867
+radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=fmkRYVTYm1Lhc_ygjcDQjaLSSUOckRQf7kFtFBhgV6Y,47337
 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
@@ -397,7 +397,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=A1mHYQXBlchxIYynC-38IY1YfkGI5Uia8OP4qWYFJ4E,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=QP7ngqspCJBNWX_hgEameGb7blzqKtMZZchAx9aJxuQ,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
@@ -422,7 +422,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.536.dist-info/METADATA,sha256=f2B_tVaTChH1-Ii6Ro-dbGujoHvcZb2TCyT0A8ZwhxY,1615
-radboy-0.0.536.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.536.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.536.dist-info/RECORD,,
+radboy-0.0.538.dist-info/METADATA,sha256=Xz4cSRkTuhVHMqvf9NMuP91JvVUvUT-GRpzlUxi23xU,1615
+radboy-0.0.538.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.538.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.538.dist-info/RECORD,,