radboy 0.0.440__tar.gz → 0.0.441__tar.gz

{radboy-0.0.440 → radboy-0.0.441}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.440
+Version: 0.0.441
 Summary: A small example package
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

radboy-0.0.441/STDOUT.TXT

@@ -0,0 +1,17 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"lds2"
+#USER INPUT# -> :"cnwdt"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"next week start"
+#USER INPUT# -> :"p"
+#USER INPUT# -> :"next week end"
+#USER INPUT# -> :"p"
+#USER INPUT# -> :"this week start"
+#USER INPUT# -> :"p"
+#USER INPUT# -> :"this week end"
+#USER INPUT# -> :"p"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.441"

{radboy-0.0.440 → radboy-0.0.441}/pyproject.toml

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

{radboy-0.0.440 → radboy-0.0.441}/radboy/DB/Prompt.py

@@ -43,14 +43,20 @@ def timedout(ptext):
         user_input = "timeout"
         return user_input
 
-def orderQuery(query,orderBy):
+def orderQuery(query,orderBy,inverse=False):
     LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
     if not isinstance(LookUpState,bool):
         LookUpState=db.detectGetOrSet('list maker lookup order',False,setValue=True,literal=False)
     if LookUpState == True:
-        query=query.order_by(orderBy.asc())
+        if not inverse:
+            query=query.order_by(orderBy.asc())
+        else:
+            query=query.order_by(orderBy.desc())
     else:
-        query=query.order_by(orderBy.desc())
+        if not inverse:
+            query=query.order_by(orderBy.desc())
+        else:
+            query=query.order_by(orderBy.asc())
     return query
 
 def generate_cmds(startcmd,endCmd):
@@ -2012,6 +2018,9 @@ CMD's are not final until ended with {Fore.magenta}{hw_delim}{Style.reset}""")
                     elif cmd.lower() in ['pc','prec calc',]:
                         resultant=TM.Tasks.TasksMode(parent=self,engine=db.ENGINE,init_only=True).prec_calc()
                         return func(resultant,data)
+                    elif cmd.lower() in generate_cmds(startcmd=['lds2','rdts'],endCmd=['',]):
+                        resultant=TM.Tasks.TasksMode(parent=self,engine=db.ENGINE,init_only=True).rd_ui()
+                        continue
                     elif cmd.lower() in ['b','back']:
                         lastTime=db.detectGetOrSet("PromptLastDTasFloat",datetime.now().timestamp(),setValue=True)
                         return
@@ -2070,7 +2079,8 @@ CMD's are not final until ended with {Fore.magenta}{hw_delim}{Style.reset}""")
 {Fore.grey_85}** {Fore.light_steel_blue}{f'{Fore.light_red},{Fore.light_steel_blue}'.join(generate_cmds(startcmd=['orddt','ordt','loads','lds'],endCmd=['frozen','Frozen','fzn']))}{Fore.light_green} print hard-coded order dates frozen load{Style.reset}
 {Fore.grey_85}** {Fore.light_steel_blue}{f'{Fore.light_red},{Fore.light_steel_blue}'.join(generate_cmds(startcmd=['orddt','ordt','loads','lds'],endCmd=['gm','lqr','general merchandise','liquor','totes','green totes','grn tts','grntts']))}{Fore.light_green} print hard-coded order dates GM Load/Liquor Load{Style.reset}
 {Fore.grey_85}** {Fore.light_steel_blue}{f'{Fore.light_red},{Fore.light_steel_blue}'.join(generate_cmds(startcmd=['orddts','ordts','loads','lds','orders','loads','rxdates'],endCmd=['','all','all dates','all dts','aldts','*']))}{Fore.light_green} print all load dates {Style.reset}
-{Fore.grey_70}**{Fore.light_green}{f'{Fore.light_red},{Fore.light_steel_blue}'.join(generate_cmds(startcmd=['units',],endCmd=['']))}{Fore.light_steel_blue} list supported units{Style.reset}
+{Fore.grey_70}** {Fore.light_steel_blue}{f'{Fore.light_red},{Fore.light_steel_blue}'.join(generate_cmds(startcmd=['units',],endCmd=['']))}{Fore.light_green} list supported units{Style.reset}
+{Fore.grey_70}** {Fore.light_steel_blue}{f'{Fore.light_red},{Fore.light_steel_blue}'.join(generate_cmds(startcmd=['lds2','rdts'],endCmd=['',]))}{Fore.light_green} repeable dates,orders,etc...{Style.reset}
 '''
                         print(extra)
                         print(helpText)
@@ -2174,7 +2184,7 @@ CMD's are not final until ended with {Fore.magenta}{hw_delim}{Style.reset}""")
                     elif cmd.lower() in ['vllo','view list lookup order']:
                         try:
                             state=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
-                            translate={True:"Ascending by Timestamp/Newest First/Last Line==Oldest",False:"Descending by Timestamp/Oldest First/Last Line==Newest"}
+                            translate={True:"Ascending by Timestamp, Newest==First Line & Last Line==Oldest",False:"Descending by Timestamp, Oldest==First Line & Last Line==Newest"}
                             print(f"{state} : {translate[state]}")
                         except Exception as e:
                             state=db.detectGetOrSet('list maker lookup order',True,setValue=True,literal=False)

{radboy-0.0.440 → radboy-0.0.441}/radboy/DB/db.py

@@ -745,7 +745,7 @@ class Template:
         m=[]
         now=datetime.now()
         microid=now.timestamp()
-        nowStr=now.strftime(" -> Time:%I:%M:%S %p(12)/%H:%M:%S(24H)\nDate:%m/%d/%Y")+f" Timestamp:{microid}\n"
+        nowStr=now.strftime(" -> Time:%I:%M:%S %p(12)/%H:%M:%S(24H)\nDate:%m/%d/%Y")+f" Today:{now.strftime("%A")} Timestamp:{microid}\n"
         m.append(f"{nowStr} -> {cc}{self.__tablename__}{Style.reset}(")
         fields=[i.name for i in self.__table__.columns]
         ft={i.name:str(i.type).lower() for i in self.__table__.columns}
@@ -765,7 +765,7 @@ class Template:
         return '\n'.join(m)
 
     def __repr__(self,vc=Fore.dark_blue+Style.bold,fc=Fore.light_green,cc=Fore.light_magenta,vg=Back.grey_50):
-        return self.str(self,vc,fc,cc,vg)
+        return self.__str__(vc,fc,cc,vg)
 
 
 class EntryDataExtras(BASE,Template):
@@ -5141,4 +5141,46 @@ class Scheduled_And_Appointments(BASE,Template):
                 setattr(self,k,kwargs.get(k))
 
 
-Scheduled_And_Appointments.metadata.create_all(ENGINE)
+Scheduled_And_Appointments.metadata.create_all(ENGINE)
+
+class RepeatableDates(BASE,Template):
+    __tablename__='RepeatableDates'
+    rd_id=Column(Integer,primary_key=True)
+
+    For_Whom=Column(String,default=None)
+    What_Is_It=Column(String,default=None)
+
+    PalletCount=Column(Float,default=0)
+
+    #if true, DO NOT USE info for DTORX
+    #repe
+    Go_By_WeekDayNames=Column(Boolean,default=True)
+    WeekDayNames=Column(String,default='[]')
+    #else, use DTORX
+
+    #DateTime recieved
+    DTORX=Column(DateTime,default=None)
+    #repeats same day every every period of x
+    #every 24h
+       
+    DTOE=Column(DateTime,default=datetime.now())
+    Comment=Column(String,default='N/A')
+
+    def as_json(self):
+        excludes=['rd_id','DTOE']
+        dd={str(d.name):self.__dict__[d.name] for d in self.__table__.columns if d.name not in excludes}
+        return json.dumps(dd)
+
+    def asID(self):
+        return f"RepeatableDates(rd_id={self.rd_id})"
+
+    def __init__(self,**kwargs):
+        for k in kwargs.keys():
+            if k in [s.name for s in self.__table__.columns]:
+                setattr(self,k,kwargs.get(k))
+
+try:
+    RepeatableDates.metadata.create_all(ENGINE)
+except Exception as e:
+    RepeatableDates.__table__.drop(ENGINE)
+    RepeatableDates.metadata.create_all(ENGINE)

{radboy-0.0.440 → radboy-0.0.441}/radboy/FB/FBMTXT.py

@@ -8,6 +8,17 @@ import re
 from datetime import timedelta
 import calendar
 from colored import Fore,Back,Style
+import itertools
+
+def generate_cmds(startcmd,endCmd):
+    cmd=(startcmd,endCmd)
+    cmds=[]
+    for i in itertools.product(startcmd,endCmd):
+        if ''.join(i) not in cmds:
+            cmds.append(''.join(i))
+        if ' '.join(i) not in cmds:
+            cmds.append(' '.join(i))
+    return cmds
 
 fm_data={
         'Decimal':{
@@ -55,6 +66,7 @@ fm_data={
             'default':[],
             },
       }
+UNDER_RND="Under Development; not functional!"
 def FormBuilderHelpText():
     TODAY_IS=datetime.now()
     z=TODAY_IS
@@ -90,6 +102,36 @@ def FormBuilderHelpText():
     {Fore.light_cyan}**{Fore.light_steel_blue}Boolean True={Fore.spring_green_3a}y,yes,Yes,Y,True,T,t,1 or an equation that results in a True such as {Fore.orange_red_1}`datetime.now()`/{datetime.now()}`!=datetime(2001,1,1)`/{datetime(2001,1,1)} or 1==1.{Style.reset}
     {Fore.light_cyan}**{Fore.light_steel_blue}Boolean False={Fore.spring_green_3a}false,no,n,N,No,False,0 or an equation that results in a False such as {Fore.orange_red_1}`datetime.now()`/{datetime.now()}`==datetime(2001,1,1)`/{datetime(2001,1,1)} or 1==0.{Style.reset}
     {Fore.medium_violet_red}**{Fore.light_magenta}When Asked for a List of integers {Fore.magenta}use 1,2,3 for indexes 1-3, {Fore.orange_red_1}or 1,3 for indexes 1 and 3, {Fore.light_red}or 1,4,6-8,10 for indexes 1,4,6,7,8, and 10,{Fore.purple_1a} or 1 for index 1.{Style.reset}
+    {UNDER_RND}
+    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming week start - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming week end - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}previous/last week start - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}previous/last week end - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+
+    {Fore.green_yellow}**{Fore.light_magenta}previous/last saturday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}previous/last sunday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}previous/last monday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}previous/last tuesday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}previous/last wednesday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}previous/last thursday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}previous/last friday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+
+    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming saturday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming sunday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming monday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming tuesday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming wednesday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming thursday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming friday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+
+    {Fore.green_yellow}**{Fore.light_magenta}saturday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} of this week only{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}sunday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} of this week only{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}monday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} of this week only{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}tuesday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} of this week only{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}wednesday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} of this week only{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}thursday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} of this week only{Style.reset}
+    {Fore.green_yellow}**{Fore.light_magenta}friday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} of this week only{Style.reset}
+
     '''
     print(msg)
 
@@ -269,17 +311,237 @@ def FormBuilderMkText(text,data,passThru=[],PassThru=True,alternative_false=None
                     return datetime(year=TODAY_IS.year,month=TODAY_IS.month,day=TODAY_IS.day)-timedelta(seconds=60*60*24*7)
 
                     '''
-                    #new cmds to be added, tab below backwards
-                    elif text.lower() in ['next week start',]:
-                        return datetime(year=TODAY_IS.year,month=TODAY_IS.month,day=TODAY_IS.day)+timedelta(seconds=60*60*24*7)
-                    elif text.lower() in ['next week end',]:
-                        return datetime(year=TODAY_IS.year,month=TODAY_IS.month,day=TODAY_IS.day)+timedelta(seconds=60*60*24*7)
-
-                    elif text.lower() in ['last week start',]:
-                        return datetime(year=TODAY_IS.year,month=TODAY_IS.month,day=TODAY_IS.day)-timedelta(seconds=60*60*24*7)
-                    elif text.lower() in ['last week end',]:
-                        return datetime(year=TODAY_IS.year,month=TODAY_IS.month,day=TODAY_IS.day)-timedelta(seconds=60*60*24*7)
+                    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming week start - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming week end - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}previous/last week start - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}previous/last week end - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    [RDY]
+                    {Fore.green_yellow}**{Fore.light_magenta}previous/last saturday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}previous/last sunday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}previous/last monday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}previous/last tuesday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}previous/last wednesday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}previous/last thursday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}previous/last friday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    [RDY]
+                    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming saturday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming sunday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming monday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming tuesday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming wednesday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming thursday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}next/this/upcoming friday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} from today{Style.reset}
+                    [RDY]
+                    {Fore.green_yellow}**{Fore.light_magenta}saturday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} of this week only{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}sunday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} of this week only{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}monday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} of this week only{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}tuesday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} of this week only{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}wednesday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} of this week only{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}thursday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} of this week only{Style.reset}
+                    {Fore.green_yellow}**{Fore.light_magenta}friday - {Fore.orange_red_1}WARNING:{Fore.light_cyan} of this week only{Style.reset}
                     '''
+                elif text.lower() in generate_cmds(startcmd=['previous','last','prev'],endCmd=['week end','w e','we']):
+                    today=datetime.now()
+                    friday=6
+                    weekEnd=today+timedelta(days=(friday-today.weekday())%7)
+                    weekEnd-=timedelta(days=7)
+                    return weekEnd
+                elif text.lower() in generate_cmds(startcmd=['previous','last','prev'],endCmd=['week start','w s','ws']):
+                    today=datetime.now()
+                    friday=6
+                    Friday=today+timedelta(days=(friday-today.weekday())%7)
+                    weekStart=Friday-timedelta(days=7)
+                    weekStart-=timedelta(days=6)
+                    return weekStart                    
+                elif text.lower() in generate_cmds(startcmd=['next','upcoming'],endCmd=['week end','w e','we']):
+                    today=datetime.now()
+                    friday=6
+                    weekEnd=today+timedelta(days=(friday-today.weekday())%7)
+                    weekEnd+=timedelta(days=7)
+                    return weekEnd
+                elif text.lower() in generate_cmds(startcmd=['next','upcoming'],endCmd=['week start','w s','ws']):                    
+                    today=datetime.now()
+                    friday=0
+                    Friday=today+timedelta(days=(friday-today.weekday())%7)
+                    weekStart=Friday-timedelta(days=7)
+                    weekStart+=timedelta(days=7)
+                    return weekStart
+                elif text.lower() in generate_cmds(startcmd=['this','current'],endCmd=['week end','w e','we']):                    
+                    today=datetime.now()
+                    friday=6
+                    weekEnd=today+timedelta(days=(friday-today.weekday())%7)
+                    return weekEnd
+                elif text.lower() in generate_cmds(startcmd=['this','current'],endCmd=['week start','w s','ws']):                    
+                    today=datetime.now()
+                    friday=6
+                    Friday=today+timedelta(days=(friday-today.weekday())%7)
+                    weekStart=Friday-timedelta(days=7)
+                    return weekStart
+                elif text.lower() in generate_cmds(startcmd=['previous','last','prev'],endCmd=['friday',]):
+                    dayNum=4
+                    today=datetime.now()
+                    daysUntil=(dayNum-today.weekday())%7
+                    dayOf=today+timedelta(days=daysUntil)
+                    lastDay=dayOf-timedelta(days=7)
+                    return lastDay
+                elif text.lower() in generate_cmds(startcmd=['previous','last','prev'],endCmd=['saturday',]):
+                    dayNum=5
+                    today=datetime.now()
+                    daysUntil=(dayNum-today.weekday())%7
+                    dayOf=today+timedelta(days=daysUntil)
+                    lastDay=dayOf-timedelta(days=7)
+                    return lastDay
+                elif text.lower() in generate_cmds(startcmd=['previous','last','prev'],endCmd=['sunday',]):
+                    dayNum=6
+                    today=datetime.now()
+                    daysUntil=(dayNum-today.weekday())%7
+                    dayOf=today+timedelta(days=daysUntil)
+                    lastDay=dayOf-timedelta(days=7)
+                    return lastDay
+                elif text.lower() in generate_cmds(startcmd=['previous','last','prev'],endCmd=['monday',]):
+                    dayNum=0
+                    today=datetime.now()
+                    daysUntil=(dayNum-today.weekday())%7
+                    dayOf=today+timedelta(days=daysUntil)
+                    lastDay=dayOf-timedelta(days=7)
+                    return lastDay
+                elif text.lower() in generate_cmds(startcmd=['previous','last','prev'],endCmd=['tuesday',]):
+                    dayNum=1
+                    today=datetime.now()
+                    daysUntil=(dayNum-today.weekday())%7
+                    dayOf=today+timedelta(days=daysUntil)
+                    lastDay=dayOf-timedelta(days=7)
+                    return lastDay
+                elif text.lower() in generate_cmds(startcmd=['previous','last','prev'],endCmd=['wednesday',]):
+                    dayNum=2
+                    today=datetime.now()
+                    daysUntil=(dayNum-today.weekday())%7
+                    dayOf=today+timedelta(days=daysUntil)
+                    lastDay=dayOf-timedelta(days=7)
+                    return lastDay
+                elif text.lower() in generate_cmds(startcmd=['previous','last','prev'],endCmd=['thursday',]):
+                    dayNum=3
+                    today=datetime.now()
+                    daysUntil=(dayNum-today.weekday())%7
+                    dayOf=today+timedelta(days=daysUntil)
+                    lastDay=dayOf-timedelta(days=7)
+                    return lastDay
+                elif text.lower() in generate_cmds(startcmd=['next','this','upcoming'],endCmd=['friday',]):
+                    dayOfWeek=4
+                    today=datetime.now()
+                    todaysDayOfWeek=today.weekday()
+                    untilDayOfWeek=(dayOfWeek-todaysDayOfWeek)%7
+                    if untilDayOfWeek == 0:
+                        untilDayOfWeek=7
+                    when=datetime(today.year,today.month,today.day)+timedelta(days=untilDayOfWeek)
+                    return when
+                elif text.lower() in generate_cmds(startcmd=['next','this','upcoming'],endCmd=['saturday',]):
+                    dayOfWeek=5
+                    today=datetime.now()
+                    todaysDayOfWeek=today.weekday()
+                    untilDayOfWeek=(dayOfWeek-todaysDayOfWeek)%7
+                    if untilDayOfWeek == 0:
+                        untilDayOfWeek=7
+                    when=datetime(today.year,today.month,today.day)+timedelta(days=untilDayOfWeek)
+                    return when
+                elif text.lower() in generate_cmds(startcmd=['next','this','upcoming'],endCmd=['sunday',]):
+                    dayOfWeek=6
+                    today=datetime.now()
+                    todaysDayOfWeek=today.weekday()
+                    untilDayOfWeek=(dayOfWeek-todaysDayOfWeek)%7
+                    if untilDayOfWeek == 0:
+                        untilDayOfWeek=7
+                    when=datetime(today.year,today.month,today.day)+timedelta(days=untilDayOfWeek)
+                    return when
+                elif text.lower() in generate_cmds(startcmd=['next','this','upcoming'],endCmd=['monday',]):
+                    dayOfWeek=0
+                    today=datetime.now()
+                    todaysDayOfWeek=today.weekday()
+                    #add %7 for next
+                    untilDayOfWeek=(dayOfWeek-todaysDayOfWeek)%7
+                    if untilDayOfWeek == 0:
+                        untilDayOfWeek=7
+                    when=datetime(today.year,today.month,today.day)+timedelta(days=untilDayOfWeek)
+                    return when
+                elif text.lower() in generate_cmds(startcmd=['next','this','upcoming'],endCmd=['tuesday',]):
+                    dayOfWeek=1
+                    today=datetime.now()
+                    todaysDayOfWeek=today.weekday()
+                    untilDayOfWeek=(dayOfWeek-todaysDayOfWeek)%7
+                    if untilDayOfWeek == 0:
+                        untilDayOfWeek=7
+                    when=datetime(today.year,today.month,today.day)+timedelta(days=untilDayOfWeek)
+                    return when
+                elif text.lower() in generate_cmds(startcmd=['next','this','upcoming'],endCmd=['wednesday',]):
+                    dayOfWeek=2
+                    today=datetime.now()
+                    todaysDayOfWeek=today.weekday()
+                    untilDayOfWeek=(dayOfWeek-todaysDayOfWeek)%7
+                    if untilDayOfWeek == 0:
+                        untilDayOfWeek=7
+                    when=datetime(today.year,today.month,today.day)+timedelta(days=untilDayOfWeek)
+                    return when
+                elif text.lower() in generate_cmds(startcmd=['next','this','upcoming'],endCmd=['thursday',]):
+                    dayOfWeek=3
+                    today=datetime.now()
+                    todaysDayOfWeek=today.weekday()
+                    untilDayOfWeek=(dayOfWeek-todaysDayOfWeek)%7
+                    if untilDayOfWeek == 0:
+                        untilDayOfWeek=7
+                    when=datetime(today.year,today.month,today.day)+timedelta(days=untilDayOfWeek)
+                    return when
+
+                elif text.lower() in ['friday',]:
+                    dayOfWeek=4
+                    today=datetime.now()
+                    todaysDayOfWeek=today.weekday()
+                    untilDayOfWeek=(dayOfWeek-todaysDayOfWeek)
+                    when=datetime(today.year,today.month,today.day)+timedelta(days=untilDayOfWeek)
+                    return when
+                elif text.lower() in ['saturday',]:
+                    dayOfWeek=5
+                    today=datetime.now()
+                    todaysDayOfWeek=today.weekday()
+                    untilDayOfWeek=(dayOfWeek-todaysDayOfWeek)
+                    when=datetime(today.year,today.month,today.day)+timedelta(days=untilDayOfWeek)
+                    return when
+                elif text.lower() in ['sunday',]:
+                    dayOfWeek=6
+                    today=datetime.now()
+                    todaysDayOfWeek=today.weekday()
+                    untilDayOfWeek=(dayOfWeek-todaysDayOfWeek)
+                    when=datetime(today.year,today.month,today.day)+timedelta(days=untilDayOfWeek)
+                    return when
+                elif text.lower() in ['monday',]:
+                    dayOfWeek=0
+                    today=datetime.now()
+                    todaysDayOfWeek=today.weekday()
+                    #add %7 for next
+                    untilDayOfWeek=(dayOfWeek-todaysDayOfWeek)
+                    when=datetime(today.year,today.month,today.day)+timedelta(days=untilDayOfWeek)
+                    return when
+                elif text.lower() in ['tuesday',]:
+                    dayOfWeek=1
+                    today=datetime.now()
+                    todaysDayOfWeek=today.weekday()
+                    untilDayOfWeek=(dayOfWeek-todaysDayOfWeek)
+                    when=datetime(today.year,today.month,today.day)+timedelta(days=untilDayOfWeek)
+                    return when
+                elif text.lower() in ['wednesday',]:
+                    dayOfWeek=2
+                    today=datetime.now()
+                    todaysDayOfWeek=today.weekday()
+                    untilDayOfWeek=(dayOfWeek-todaysDayOfWeek)
+                    when=datetime(today.year,today.month,today.day)+timedelta(days=untilDayOfWeek)
+                    return when
+                elif text.lower() in ['thursday',]:
+                    dayOfWeek=3
+                    today=datetime.now()
+                    todaysDayOfWeek=today.weekday()
+                    untilDayOfWeek=(dayOfWeek-todaysDayOfWeek)
+                    when=datetime(today.year,today.month,today.day)+timedelta(days=untilDayOfWeek)
+                    return when
+
                 elif text.lower() in ['next year',]:
                     TODAY_IS=datetime.now()
                     return datetime(year=TODAY_IS.year,month=TODAY_IS.month,day=TODAY_IS.day)+timedelta(seconds=60*60*24*365)

{radboy-0.0.440 → radboy-0.0.441}/radboy/HealthLog/HealthLog.py

@@ -94,6 +94,7 @@ class HealthLogUi:
 										continue
 									
 							else:
+								entry=None
 								htext=f"{Fore.orange_red_1}No Results for '{Fore.cyan}{barcode}{Fore.orange_red_1}'{Style.reset}"
 								again=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Try another search?[yes/no=default]",helpText=htext,data="boolean")
 								if again is None: