radboy 0.0.350__py3-none-any.whl → 0.0.352__py3-none-any.whl

radboy/DB/db.py

@@ -736,8 +736,11 @@ class EntryDataExtras(BASE,Template):
                         with Session(ENGINE) as session:
                             check=session.query(self.__class__).filter(self.__class__.field_name==kwargs[k],self.__class__.EntryId==kwargs['EntryId']).first()
                             if isinstance(check,self.__class__):
-                                dateStr=datetime.now().strftime("[Updated on %m/%d/%Y at %H:%M:%S.]")
-                                kwargs[k]=f"{kwargs[k]} {dateStr}"
+                                if check.field_value == kwargs['field_value']:
+                                    raise Exception(f"Value is duplicated for {k}={kwargs['field_value']}")
+                                else:
+                                    dateStr=datetime.now().strftime("[Updated on %m/%d/%Y at %H:%M:%S.]")
+                                    kwargs[k]=f"{kwargs[k]} {dateStr}"
                     setattr(self,k,str(kwargs[k]))
                 else:
                     setattr(self,k,kwargs[k])

radboy/EntryExtras/Extras.py

@@ -1,6 +1,13 @@
 #MobileInventoryCLI is now radboy
 from . import *
+from collections import OrderedDict
 from radboy.DB.db import ENGINE
+import uuid,base64
+
+#generated by google gemini
+def generate_24_char_uuid():
+    return Entry.cfmt(None,str(uuid.uuid4()).replace("-",''))
+
 def get_bool(text):
     if text in (None,'',False,'n','N','NO','No','nO','False','false',0,'0'):
         return False
@@ -176,7 +183,382 @@ class EntryDataExtrasMenu:
             except Exception as e:
                 print(e)
 
-    nutrients={
+    def enable_all_diabetic_facts(self):
+        with Session(ENGINE) as session:
+            try:
+                toolid=-1
+                try:
+                    diabetic_facts_placeholder=session.query(Entry).filter(Entry.EntryId==toolid).first()
+                    if diabetic_facts_placeholder is None:
+                        diabetic_facts_placeholder=Entry(Name="Diabetic_Facts_PlaceHolder",Barcode="Diabetic_Facts_PlaceHolder",Code="Diabetic_Facts_PlaceHolder",InList=False,EntryId=toolid)
+                        session.add(diabetic_facts_placeholder)
+                        session.commit()
+                        session.flush()
+                        session.refresh(diabetic_facts_placeholder)
+                except Exception as ee:
+                    print(ee)
+
+                diabetic_fields=self.diabetic_fields
+                ct=len(diabetic_fields)
+                for num,k in enumerate(diabetic_fields):
+                    check=session.query(EntryDataExtras).filter(and_(EntryDataExtras.field_name.icontains(k),EntryDataExtras.field_value.icontains(diabetic_fields[k]))).first()
+                    if check is not None:
+                        print(f"Skipping Pre-Existing {k}!")
+                        continue
+                    extra=EntryDataExtras(field_name=k,field_type="str",field_value=str(diabetic_fields[k]),EntryId=toolid)
+                    session.add(extra)
+                    session.commit()
+                    session.flush() 
+                    session.refresh(extra)
+                    print(f"{Fore.cyan}{num}/{Fore.light_cyan}{num+1} of {Fore.light_red}{ct} -> {Fore.orange_red_1}Adding -> {extra}!{Style.reset}")
+                session.commit()
+            except Exception as e:
+                print(e)
+
+
+    def delete_all_diabetic_facts(self):
+        code=''.join([str(random.randint(0,9)) for i in range(10)])
+        verification_protection=detectGetOrSet("Protect diabetic Facts From Delete",code,setValue=False,literal=True)
+        while True:
+            try:
+                really=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Do You really want to delete all diabetic facts fields?",helpText="yes or no boolean,default is NO",data="boolean")
+                if really in [None,]:
+                    return
+                elif really in ['d',False]:
+                    return
+                else:
+                    pass
+                really=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"To {Fore.orange_red_1}Delete everything completely,{Fore.light_steel_blue} What is todays date?{Style.reset}",helpText="type y/yes for prompt or type as m.d.Y",data="datetime")
+                if really in [None,'d']:
+                    return
+                today=datetime.today()
+                if really.day == today.day and really.month == today.month and really.year == today.year:
+                    really=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Please type the verification code {Style.reset}'{DayLog.cfmt(None,verification_protection)}'?",helpText=f"type '{DayLog.cfmt(None,verification_protection)}' to finalize!",data="string")
+                    if really in [None,]:
+                        return
+                    elif really in ['d',False]:
+                        return
+                    elif really == verification_protection:
+                        break
+                else:
+                    pass
+            except Exception as e:
+                print(e)
+        with Session(ENGINE) as session:
+            try:
+                toolid=-1
+                diabetic_facts_placeholder=session.query(Entry).filter(Entry.EntryId==toolid).all()
+                diabetic_facts_placeholder_extras=session.query(EntryDataExtras).filter(EntryDataExtras.EntryId==toolid).all()
+
+                print(f"{Fore.light_yellow}Deleting Diabetic_Facts_PlaceHolder{Style.reset}")   
+                for i in diabetic_facts_placeholder:
+                    print(f"{Fore.light_red}Deleting {i.seeShort()}{Style.reset}")
+                    session.delete(i)
+                print(f"{Fore.light_yellow}Deleting Diabetic_Facts_PlaceHolder_Extras{Style.reset}") 
+                for i in diabetic_facts_placeholder_extras:
+                    print(f"{Fore.light_red}Deleting {i.field_name}{Style.reset}")
+                    session.delete(i)
+                session.commit()
+                dependency=Prompt.__init2__(None,func=FormBuilderMkText,ptext="check to see if its not needed elsewhere and delete it if it is not needed[Y/n]",helpText="yes(default) or no",data="boolean")
+                if dependency is None:
+                    return
+                elif dependency in [True,'d']:
+                    results=session.query(EntryDataExtras).all()
+                    ct=len(results)
+                    for num,i in enumerate(results):
+                        msg=f"{Fore.orange_red_1}DEPENDENCY CHECK{Fore.dark_goldenrod}-> {Fore.cyan}{num}/{Fore.light_cyan}{num+1} of {Fore.light_red}{ct} -> {i}"
+                        print(msg)
+                        check=session.query(Entry).filter(Entry.EntryId==i.EntryId).first()
+                        check2=session.query(DayLog).filter(DayLog.EntryId==i.EntryId).first()
+                        if not check and not check2:
+                            session.delete(i)
+                        if num % 100 == 0:
+                            session.commit()
+                    session.commit()
+                    session.flush()
+                else:
+                    print(f"{Fore.light_yellow}Deleting All nutrients facts entry data extras{Style.reset}")
+                    for fieldname in self.diabetic_fields:
+                        print(f"{Fore.light_red}Deleting{Fore.cyan} {fieldname}{Style.reset}")
+                        allOthers=session.query(EntryDataExtras).filter(EntryDataExtras.field_name==fieldname).delete()
+                        session.commit()
+                    print(f"{Fore.light_red}Done!{Style.reset}")
+            except Exception as e:
+                print(e)
+
+    def enable_all_extraPresets_facts(self):
+        with Session(ENGINE) as session:
+            try:
+                toolid=-1
+                try:
+                    extraPresets_facts_placeholder=session.query(Entry).filter(Entry.EntryId==toolid).first()
+                    if extraPresets_facts_placeholder is None:
+                        extraPresets_facts_placeholder=Entry(Name="Diabetic_Facts_PlaceHolder",Barcode="Diabetic_Facts_PlaceHolder",Code="Diabetic_Facts_PlaceHolder",InList=False,EntryId=toolid)
+                        session.add(extraPresets_facts_placeholder)
+                        session.commit()
+                        session.flush()
+                        session.refresh(extraPresets_facts_placeholder)
+                except Exception as ee:
+                    print(ee)
+
+                extraPresets_fields=self.extraPresets_fields
+                ct=len(extraPresets_fields)
+                for num,k in enumerate(extraPresets_fields):
+                    check=session.query(EntryDataExtras).filter(and_(EntryDataExtras.field_name.icontains(k),EntryDataExtras.field_value.icontains(extraPresets_fields[k]))).first()
+                    if check is not None:
+                        print(f"Skipping Pre-Existing {k}!")
+                        continue
+                    extra=EntryDataExtras(field_name=k,field_type="str",field_value=str(extraPresets_fields[k]),EntryId=toolid)
+                    session.add(extra)
+                    session.commit()
+                    session.flush() 
+                    session.refresh(extra)
+                    print(f"{Fore.cyan}{num}/{Fore.light_cyan}{num+1} of {Fore.light_red}{ct} -> {Fore.orange_red_1}Adding -> {extra}!{Style.reset}")
+                session.commit()
+            except Exception as e:
+                print(e)
+
+
+    def delete_all_extraPresets_facts(self):
+        code=''.join([str(random.randint(0,9)) for i in range(10)])
+        verification_protection=detectGetOrSet("Protect extraPresets Facts From Delete",code,setValue=False,literal=True)
+        while True:
+            try:
+                really=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Do You really want to delete all extraPresets facts fields?",helpText="yes or no boolean,default is NO",data="boolean")
+                if really in [None,]:
+                    return
+                elif really in ['d',False]:
+                    return
+                else:
+                    pass
+                really=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"To {Fore.orange_red_1}Delete everything completely,{Fore.light_steel_blue} What is todays date?{Style.reset}",helpText="type y/yes for prompt or type as m.d.Y",data="datetime")
+                if really in [None,'d']:
+                    return
+                today=datetime.today()
+                if really.day == today.day and really.month == today.month and really.year == today.year:
+                    really=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Please type the verification code {Style.reset}'{DayLog.cfmt(None,verification_protection)}'?",helpText=f"type '{DayLog.cfmt(None,verification_protection)}' to finalize!",data="string")
+                    if really in [None,]:
+                        return
+                    elif really in ['d',False]:
+                        return
+                    elif really == verification_protection:
+                        break
+                else:
+                    pass
+            except Exception as e:
+                print(e)
+        with Session(ENGINE) as session:
+            try:
+                toolid=-1
+                extraPresets_facts_placeholder=session.query(Entry).filter(Entry.EntryId==toolid).all()
+                extraPresets_facts_placeholder_extras=session.query(EntryDataExtras).filter(EntryDataExtras.EntryId==toolid).all()
+
+                print(f"{Fore.light_yellow}Deleting Diabetic_Facts_PlaceHolder{Style.reset}")   
+                for i in extraPresets_facts_placeholder:
+                    print(f"{Fore.light_red}Deleting {i.seeShort()}{Style.reset}")
+                    session.delete(i)
+                print(f"{Fore.light_yellow}Deleting Diabetic_Facts_PlaceHolder_Extras{Style.reset}") 
+                for i in extraPresets_facts_placeholder_extras:
+                    print(f"{Fore.light_red}Deleting {i.field_name}{Style.reset}")
+                    session.delete(i)
+                session.commit()
+                dependency=Prompt.__init2__(None,func=FormBuilderMkText,ptext="check to see if its not needed elsewhere and delete it if it is not needed[Y/n]",helpText="yes(default) or no",data="boolean")
+                if dependency is None:
+                    return
+                elif dependency in [True,'d']:
+                    results=session.query(EntryDataExtras).all()
+                    ct=len(results)
+                    for num,i in enumerate(results):
+                        msg=f"{Fore.orange_red_1}DEPENDENCY CHECK{Fore.dark_goldenrod}-> {Fore.cyan}{num}/{Fore.light_cyan}{num+1} of {Fore.light_red}{ct} -> {i}"
+                        print(msg)
+                        check=session.query(Entry).filter(Entry.EntryId==i.EntryId).first()
+                        check2=session.query(DayLog).filter(DayLog.EntryId==i.EntryId).first()
+                        if not check and not check2:
+                            session.delete(i)
+                        if num % 100 == 0:
+                            session.commit()
+                    session.commit()
+                    session.flush()
+                else:
+                    print(f"{Fore.light_yellow}Deleting All nutrients facts entry data extras{Style.reset}")
+                    for fieldname in self.extraPresets_fields:
+                        print(f"{Fore.light_red}Deleting{Fore.cyan} {fieldname}{Style.reset}")
+                        allOthers=session.query(EntryDataExtras).filter(EntryDataExtras.field_name==fieldname).delete()
+                        session.commit()
+                    print(f"{Fore.light_red}Done!{Style.reset}")
+            except Exception as e:
+                print(e)
+
+    extraPresets_fields=OrderedDict({
+    'Radio-active':'Yes',
+    'Carcinogen?':'Yes',
+    'Toxic?':'Yes',
+    'Poisonous?':'Yes',
+    'Venomous?':'Yes',
+    'Sharp Objects?':'Yes',
+    'Bio-Hazard?':'Yes',
+    'Pathogen Warning.':'N/A',
+    'Caustic/Corrosive?':'Yes',
+
+    'Hearing Protection Required?':'Yes',
+    'Eye Protection Required?':'Yes',
+    'PPE Required?':'Yes',
+    'PPE Required Type?':'N/A',
+    'PPE Required Name?':'N/A',
+
+    'Explosive Under Pressure?':'Yes',
+    'Hazmat Required??':'Yes',
+    'Cut Level A1?':'Yes',
+    'Cut Level A2?':'Yes',
+    'Cut Level A3?':'Yes',
+
+    'Contact Type Phone address/number/identifier':'N/A',
+    'Contact Type Mobile/Cellular address/number/identifier':'N/A',
+    'Contact Type Text Message address/number/identifier':'N/A',
+    'Contact Type Email address/number/identifier':'N/A',
+    'Contact Type Postal Mail address/number/identifier':'N/A',
+    'Contact Type Mail Pigeon address/number/identifier':'N/A',
+    'Contact Type Social address/number/identifier':'N/A',
+
+    "SURGEON GENERAL'S WARNING 1(Smoke Related Tobacco Products)":"Smoking Causes Lung Cancer, Heart Disease, Emphysema, and May Complicate Pregnancy.",
+    "SURGEON GENERAL'S WARNING 2(Smoke Related Tobacco Products)":"Quitting Smoking Now Greatly Reduces Serious Risks to Your Health.",
+    "SURGEON GENERAL'S WARNING 3(Smoke Related Tobacco Products)":"Smoking By Pregnant Women May Result in Fetal Injury, Premature Birth, and Low Birth Weight.",
+    "SURGEON GENERAL'S WARNING 4(Smoke Related Tobacco Products)":" Cigarette Smoke Contains Carbon Monoxide.",
+    "GOVERNMENT WARNING(Alcohol)":"(1) According to the Surgeon General, women should not drink alcoholic beverages during pregnancy because of the risk of birth defects. (2) Consumption of alcoholic beverages impairs your ability to drive a car or operate machinery, and may cause health problems.",
+    "GOVERNMENT WARNING(Cannabis[CA PROP 64])":"THIS PACKAGE CONTAINS CANNABIS, A SCHEDULE I CONTROLLED SUBSTANCE. KEEP OUT OF REACH OF CHILDREN AND ANIMALS. CANNABIS MAY ONLY BE POSSESSED OR CONSUMED BY PERSONS 21 YEARS OF AGE OR OLDER UNLESS THE PERSON IS A QUALIFIED PATIENT. CANNABIS USE WHILE PREGNANT OR BREASTFEEDING MAY BE HARMFUL. CONSUMPTION OF CANNABIS IMPAIRS YOUR ABILITY TO DRIVE AND OPERATE MACHINERY. PLEASE USE EXTREME CAUTION.",
+
+    'Recycle Warning - Steel Can':'Steel Can; Please Recycle',
+    'Recycle Warning - Plastic Bottle':'Plastic Bottle; Please Recycle',
+    
+    'Perishable Warning - Frozen':'Perishable; Keep Frozen',
+    'Perishable Warning - Refrigerated':'Perishable; Keep Refrigerated',
+
+    'Sharp Edge Warning':'Edges are Sharp when opened',
+    'Suffocation Warning - Plastic Bag':'May Cause Suffocation if plastic bag clings to mouth and nose.',
+
+    'Electrical Warning HV':'High Voltage',
+    'Electrical Warning HA':'High Current',
+    'Electrical Warning HAV':'High Current and Voltage',
+
+    'Keep Out of Reach of Children under the age of':'6 years',
+
+    'Alcohol! Age Restricted':'Yes',
+    'Alcohol! Age Restriction':'18years',
+    'Cannabis! Age Restricted':'Yes',
+    'Cannabis! Age Restriction':'21y',
+
+    'Controlled Substance':'Yes',
+    'Smart Label':'',
+    'URL':'https://www.google.com/',
+    'Distributed By':'N/A',
+    'Country Of Origin':'N/A/China/USA/etc',
+    'CasePack/MasterPack Barcode':'N/A',
+
+    'Total Cannabinoids %':'0%',
+    'Total Cannabinoids mg':'0mg',
+    'Total Cannabinoids %(mg)':'0%(0mg)',
+
+    'THC Cannabinoids %':'0%',
+    'THC Cannabinoids mg':'0mg',
+    'THC Cannabinoids %(mg)':'0%(0mg)',
+
+    'CBD Cannabinoids %':'0%',
+    'CBD Cannabinoids mg':'0mg',
+    'CBD Cannabinoids %(mg)':'0%(0mg)',
+
+    'Manufactured By/Distributed By/Company':'SomeCorp inc., Mineapolis, MN 55440 USA',
+    'Retailer':'',
+    'Vendor':'',
+    'Religious':'',
+    'Genre':'',
+    'Rating':'',
+
+    'DDeC:000':'Generalities, Computer Science, Information & General Works',
+    'DDeC:100':'Philosophy & Psychology.',
+    'DDeC:200':'Religion',
+    'DDeC:300':'Social Sciences',
+    'DDeC:400':'Language',
+    'DDeC:500':'Natural Sciences & Mathematics',
+    'DDeC:600':'Technology (Applied Sciences)',
+    'DDeC:700':'The Arts',
+    'DDeC:800':'Literature & Rhetoric',
+    'DDeC:900':'Geography & History',
+    'DUI Decimal Number':'000.000',
+    '*DDeC:NUM':'DUI DEC:Number of Category',
+    'Location':'from Google Maps or From other Coordinate providing app',
+    'Related Search Terms For External Source':'',
+    'External Search Source':'www.google.com',
+    'Related Search Terms For Local Search':'',
+
+    'BatchId':'D.PR42B.BLD.A06.A08',
+    'UID':generate_24_char_uuid(),
+    'Manufacture Date':'N/A',
+    'Expiration Date(Not Associated with the Expiry System) Period(From Date of Manufacture to Date of Expiration)':'N/A',
+    'Expiration Date(Not Associated with the Expiry System)':'N/A',
+
+    'Serial #':'N/A',
+    'Serial No.':'N/A',
+    'Serial Number':'N/A',
+
+    'MAC Address':'FF:FF:FF:FF:FF:FF',
+    'IMEID':'N/A',
+    'ICCID':'N/A',
+    'IMSI':'N/A',
+    'IMEI':'N/A',
+    'Carrier Name':'N/A',
+    'Carrier Type':'N/A',
+    'Service Type':'N/A',
+    'Service Name':'N/A',
+
+    'Taxable @ Locale':'Yes @/At Seaside(93955)',
+    'Tax Type @ Locale for Tax Rate %':'Sales Tax at Seaside(93955) for 0.0925',
+    'Locale Where Taxed @/At Tax Rate %':'Seaside(93955) for 0.0925',
+    'Locale Tax Rate % @ Locale':'0.0925 at/@ seaside(93955)',
+
+    'Prescription Rx?':'Yes',
+    'Prescription Text':'N/A',
+    'Prescription Name':'N/A',
+    'Prescription ID':'N/A',
+    'Homeopathic?':'Yes',
+    'Herbal?':'Yes',
+    })
+
+    diabetic_fields=OrderedDict({
+    'Unit':'U',
+    'Carbohydrate':'0g',
+    'Hypoglycemia Response(How to Treat)':'Treat with 15 Grams of Carbs.; Chew three(3) -/to four(4) glucose tablets; Consume 1 Tbsp of Honey; Drink 1/2 cup of Juice or regular soda.',
+    
+    'Sweets?':'No',
+    'Dairy(Milk & Yogurt)?':'No',
+    'Fruit?':'No',
+    'Starch Vegatable?':'No',
+    'Protien?':'No',
+    'High in Omega-3 Fat?':'No',
+    'Non-Starchy Vegatable?':'No',
+    
+    'Suggested Fruit Consumption':'1 small apple',
+    'Suggested Dairy Consumption':'1 cup milk',
+    'Suggested Grains Consumption':'1/3 Cup Quinoa or/|| 1/4 Bagel',
+    'Suggested Starch Vegatables Consumption':'1 Cup Beets or/|| 1/2 Cup Corn',
+    'Suggested Combo Foods Consumption':'1/2 Slice Pizza or/|| 1/2 Cup Ice Cream',
+
+    '1 Serving':'15g',
+    '2 Serving':'30g',
+    '3 Serving':'45g',
+    'Meals':'30g-60g(2 servings - 4 servings)',
+    'Snacks':'>=(less than, or equal to)15 grams(>=[less than, or equal to]1 Serving)',
+
+    'Insulin Type: Rapid Acting?':'No',
+    'Insulin Type: Short Acting?':"No",
+    'Insulin Type: Intermediate?':"No",
+    'Insulin Type: Combination Intermediate/Rapid Acting?':"No",
+    'Insulin Type: Long Acting?':'No',
+    'Insulin Type: Combination Long Acting/Rapid Acting?':'No',
+    'Insulin Type: Regular U-500?':'No',
+    })
+
+    nutrients=OrderedDict({
+        "Caffiene Content Per Fluid Qty (20mg/15floz)":"20mg/15floz",
         'Protien':'0g',
         "Added sugars":    "50g",
         "Biotin":  "30mcg",
@@ -229,7 +611,26 @@ class EntryDataExtrasMenu:
         "Calcium": "320mg",
         "Iron":    "1.6mg",
         "Potassium":   "510mg",
-    }
+    })
+
+
+    def colorize(self,msg,num,ct):
+        return f"{Fore.light_green}{num}/{Fore.light_cyan}{num+1} {Fore.light_red}of {ct}{Fore.dark_goldenrod} -> {Fore.grey_70}{msg}{Style.reset}"
+
+    def list_nutrient_presets(self):
+        ct=len(self.nutrients)
+        for num,f in enumerate(self.nutrients):
+            print(self.colorize(f"{f} = {self.nutrients[f]}",num,ct))
+
+    def list_diabetic_presets(self):
+        ct=len(self.diabetic_fields)
+        for num,f in enumerate(self.diabetic_fields):
+            print(self.colorize(f"{f} = {self.diabetic_fields[f]}",num,ct))
+
+    def list_extraPresets_presets(self):
+        ct=len(self.extraPresets_fields)
+        for num,f in enumerate(self.extraPresets_fields):
+            print(self.colorize(f"{f} = {self.extraPresets_fields[f]}",num,ct))
 
     def delete_all_nutritional_facts(self):
         code=''.join([str(random.randint(0,9)) for i in range(10)])
@@ -304,12 +705,15 @@ class EntryDataExtrasMenu:
 
     def af2e(self,barcode=None):
         with Session(ENGINE) as session:
-            if barcode != None:
-                search=barcode
+            if self.code is None or not isinstance(self.code,str):
+                if barcode != None:
+                    search=barcode
+                else:
+                    search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search? [Barcode,Code,Name]",helpText="searches Barcode,Code,Name",data="string")
+                    if search in [None]:
+                        return
             else:
-                search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search? [Barcode,Code,Name]",helpText="searches Barcode,Code,Name",data="string")
-                if search in [None]:
-                    return
+                search=self.code
             results=session.query(Entry).filter(or_(Entry.Barcode==search,Entry.Code==search,Entry.Barcode.icontains(search),Entry.Code.icontains(search),Entry.Name.icontains(search))).all()
             ct=len(results)
             if ct == 0:
@@ -368,12 +772,15 @@ class EntryDataExtrasMenu:
 
     def sf2e(self,barcode=None):
         with Session(ENGINE) as session:
-            if barcode != None:
-                search=barcode
+            if self.code is None or not isinstance(self.code,str):
+                if barcode != None:
+                    search=barcode
+                else:
+                    search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search? [Barcode,Code,Name]",helpText="searches Barcode,Code,Name",data="string")
+                    if search in [None]:
+                        return
             else:
-                search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search? [Barcode,Code,Name]",helpText="searches Barcode,Code,Name",data="string")
-                if search in [None]:
-                    return
+                search=self.code
             results=session.query(Entry).filter(or_(Entry.Barcode==search,Entry.Code==search,Entry.Barcode.icontains(search),Entry.Code.icontains(search),Entry.Name.icontains(search))).all()
             ct=len(results)
             if ct == 0:
@@ -459,134 +866,144 @@ class EntryDataExtrasMenu:
     def sch_f2e(self,barcode=None):
         with Session(ENGINE) as session:
             while True:
-                if barcode != None:
-                    search=barcode
-                else:
-                    search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search? [Barcode,Code,Name]",helpText="searches Barcode,Code,Name",data="string")
-                    if search in [None]:
-                        return
+                try:
+                    if self.code is None or not isinstance(self.code,str):
+                        if barcode != None:
+                            search=barcode
+                        else:
+                            search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search? [Barcode,Code,Name]",helpText="searches Barcode,Code,Name",data="string")
+                            if search in [None]:
+                                return
+                    else:
+                        search=self.code
 
-                results=session.query(Entry).filter(or_(Entry.Barcode==search,Entry.Code==search,Entry.Barcode.icontains(search),Entry.Code.icontains(search),Entry.Name.icontains(search))).all()
-                ct=len(results)
-                if ct == 0:
-                    print("No Results were Found!")
-                    return
-                msg=[]
-                for num,i in enumerate(results):
-                    msg.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {i.seeShort()}")
-                msg='\n'.join(msg)
-                product=None
-                while True:
-                    print(msg)
-                    index=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index do you wish to use?",helpText=msg,data="integer")
-                    if index in [None,]:
+                    results=session.query(Entry).filter(or_(Entry.Barcode==search,Entry.Code==search,Entry.Barcode.icontains(search),Entry.Code.icontains(search),Entry.Name.icontains(search))).all()
+                    ct=len(results)
+                    if ct == 0:
+                        print("No Results were Found!")
                         return
-                    try:
-                        product=results[index]
-                        break
-                    except Exception as e:
-                        print(e)
-                if product in [None,]:
-                    return
-                print("sf2e()")
-                while True:
+                    msg=[]
+                    for num,i in enumerate(results):
+                        msg.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {i.seeShort()}")
+                    msg='\n'.join(msg)
+                    product=None
                     while True:
+                        print(msg)
+                        index=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index do you wish to use?",helpText=msg,data="integer")
+                        if index in [None,]:
+                            return
                         try:
-                            fs=[]
-                            fse=session.query(EntryDataExtras).group_by(EntryDataExtras.field_name,EntryDataExtras.field_type).all()
-                            ct_fse=len(fse)
-                            for nunm,i in enumerate(fse):
-                                fs.append(f"{Fore.light_yellow}{num}/{Fore.light_cyan}{num+1} of {Fore.light_red}{ct_fse} -> {Fore.light_magenta}{i.field_name}{Style.reset}")
-                            fs='\n'.join(fs)
-                            field_search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search field?",helpText=f"searches EntryDataExtras field_names:\n{fs}",data="string")
-                            if field_search in [None]:
-                                return
-                            elif field_search in ['d',]:
-                                field_search=''
-                            query=session.query(EntryDataExtras).filter(EntryDataExtras.field_name.icontains(field_search))
-                            results_ede=query.group_by(EntryDataExtras.field_name,EntryDataExtras.field_type).all()
-                            if len(results_ede) < 1:
-                                continue
+                            product=results[index]
                             break
                         except Exception as e:
                             print(e)
-                    field=None
-                    msg_ede=[]
-                    for num,i in enumerate(results_ede):
-                        if num%2==0:
-                            color=Fore.cyan
-                        elif num%3==0:
-                            color=Fore.light_cyan
-                        elif num%4==0:
-                            color=Fore.light_steel_blue
-                        elif num%5==0:
-                            color=Fore.light_green
-                        elif num%6==0:
-                            color=Fore.turquoise_4
-                        elif num%7==0:
-                            color=Fore.deep_sky_blue_3a
-                        elif num%8==0:
-                            color=Fore.spring_green_3a
-                        elif num%9==0:
-                            color=Fore.dark_cyan
-                        else:
-                            color=Fore.light_blue
-                        msg_ede.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {color}{i.field_name}{Style.reset}:{i.field_type} ede_id={i.ede_id} doe={i.doe}")
-                    msg_ede='\n'.join(msg_ede)
+                    if product in [None,]:
+                        return
+                    print("sf2e()")
                     while True:
-                        try:
-                            print(msg_ede)
-                            index=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index do you wish to use?",helpText=msg_ede,data="integer")
-                            if index in [None,]:
-                                return
-                            if not isinstance(index,int):
-                                print(f"{Fore.light_red}Index must be an {Fore.light_cyan}integer{Style.reset}")
-                                continue
+                        while True:
                             try:
-                                print(index)
-                                if index <= len(results_ede)-1:
-                                    field=results_ede[index]
-                                else:
-                                    print(f"index is not within 0-{len(results_ede)-1}")
+                                fs=[]
+                                fse=session.query(EntryDataExtras).group_by(EntryDataExtras.field_name,EntryDataExtras.field_type).all()
+                                ct_fse=len(fse)
+                                for nunm,i in enumerate(fse):
+                                    fs.append(f"{Fore.light_yellow}{num}/{Fore.light_cyan}{num+1} of {Fore.light_red}{ct_fse} -> {Fore.light_magenta}{i.field_name}{Style.reset}")
+                                fs='\n'.join(fs)
+                                field_search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search field?",helpText=f"searches EntryDataExtras field_names:\n{fs}",data="string")
+                                if field_search in [None]:
+                                    return
+                                elif field_search in ['d',]:
+                                    field_search=''
+                                query=session.query(EntryDataExtras).filter(EntryDataExtras.field_name.icontains(field_search))
+                                results_ede=query.group_by(EntryDataExtras.field_name,EntryDataExtras.field_type).all()
+                                if len(results_ede) < 1:
                                     continue
                                 break
                             except Exception as e:
                                 print(e)
-                                break
-                        except Exception as e:
-                            print(e)
-                    if field == None:
-                        return
-                    field_name=field.field_name
-                    field_type=field.field_type
-                    field_value=Prompt.__init2__(self,func=FormBuilderMkText,ptext="What do you wish to store as the value?",helpText=field_type,data=field_type)
-                    if field_value in [None,]:
-                        return
-                    
-                    print(field_name,field_type,field_value)
-                    extra=EntryDataExtras(field_name=field_name,field_type=field_type,field_value=field_value,EntryId=product.EntryId)
-                    session.add(extra)
-                    session.commit()
-                    session.refresh(extra)
-                    print(extra)
-                    anotherField=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Add another field to this product[y/n]?",helpText="yes/no/boolean",data="boolean")
-                    if anotherField in [None,]:
-                        return
-                    elif anotherField in ['d',True]:
-                        continue
-                    else:
+                        field=None
+                        msg_ede=[]
+                        for num,i in enumerate(results_ede):
+                            if num%2==0:
+                                color=Fore.cyan
+                            elif num%3==0:
+                                color=Fore.light_cyan
+                            elif num%4==0:
+                                color=Fore.light_steel_blue
+                            elif num%5==0:
+                                color=Fore.light_green
+                            elif num%6==0:
+                                color=Fore.turquoise_4
+                            elif num%7==0:
+                                color=Fore.deep_sky_blue_3a
+                            elif num%8==0:
+                                color=Fore.spring_green_3a
+                            elif num%9==0:
+                                color=Fore.dark_cyan
+                            else:
+                                color=Fore.light_blue
+                            msg_ede.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {color}{i.field_name}{Style.reset}:{i.field_type} ede_id={i.ede_id} doe={i.doe}")
+                        msg_ede='\n'.join(msg_ede)
+                        while True:
+                            try:
+                                print(msg_ede)
+                                index=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index do you wish to use?",helpText=msg_ede,data="integer")
+                                if index in [None,]:
+                                    return
+                                if not isinstance(index,int):
+                                    print(f"{Fore.light_red}Index must be an {Fore.light_cyan}integer{Style.reset}")
+                                    continue
+                                try:
+                                    print(index)
+                                    if index <= len(results_ede)-1:
+                                        field=results_ede[index]
+                                    else:
+                                        print(f"index is not within 0-{len(results_ede)-1}")
+                                        continue
+                                    break
+                                except Exception as e:
+                                    print(e)
+                                    break
+                            except Exception as e:
+                                print(e)
+                        if field == None:
+                            return
+                        field_name=field.field_name
+                        field_type=field.field_type
+                        field_value=Prompt.__init2__(self,func=FormBuilderMkText,ptext="What do you wish to store as the value?",helpText=field_type,data=field_type)
+                        if field_value in [None,]:
+                            return
+                        
+                        print(field_name,field_type,field_value)
+                        extra=EntryDataExtras(field_name=field_name,field_type=field_type,field_value=field_value,EntryId=product.EntryId)
+                        session.add(extra)
+                        session.commit()
+                        session.refresh(extra)
+                        print(extra)
+                        anotherField=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Add another field to this product[y/n]?",helpText="yes/no/boolean",data="boolean")
+                        if anotherField in [None,]:
+                            return
+                        elif anotherField in ['d',True]:
+                            continue
+                        else:
+                            break
+                    if barcode != None:
                         break
-                if barcode != None:
-                    break
+                except Exception as e:
+                    print(e)
+                    
 
     def sch_c2e(self,barcode=None):
         with Session(ENGINE) as session:
-            if barcode != None:
-                search=barcode
+            if self.code is None or not isinstance(self.code,str):
+                if barcode != None:
+                    search=barcode
+                else:
+                    search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search? [Barcode,Code,Name]",helpText="searches Barcode,Code,Name",data="string")
+                    if search in [None]:
+                        return
             else:
-                search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search? [Barcode,Code,Name]",helpText="searches Barcode,Code,Name",data="string")
-                if search in [None]:
-                    return
+                search=self.code
 
             results=session.query(Entry).filter(or_(Entry.Barcode==search,Entry.Code==search,Entry.Barcode.icontains(search),Entry.Code.icontains(search),Entry.Name.icontains(search))).all()
             ct=len(results)
@@ -753,9 +1170,12 @@ class EntryDataExtrasMenu:
 
     def lookup(self):
         with Session(ENGINE) as session:
-            search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search? [Barcode,Code,Name]",helpText="searches Barcode,Code,Name",data="string")
-            if search in [None]:
-                return
+            if self.code is None or not isinstance(self.code,str):
+                search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search? [Barcode,Code,Name]",helpText="searches Barcode,Code,Name",data="string")
+                if search in [None]:
+                    return
+            else:
+                search=self.code
             results=session.query(Entry).filter(or_(Entry.Barcode==search,Entry.Code==search,Entry.Barcode.icontains(search),Entry.Code.icontains(search),Entry.Name.icontains(search))).all()
             ct=len(results)
             if ct == 0:
@@ -790,9 +1210,57 @@ class EntryDataExtrasMenu:
             print(product.seeShort())
             print(mtext)
 
+    def list_all_fields_generator(self):
+        print("laaf()")
+        with Session(ENGINE) as session:
+            fields=session.query(EntryDataExtras).group_by(EntryDataExtras.field_name,EntryDataExtras.field_type).order_by(EntryDataExtras.doe).all()
+            ct=len(fields)
+            for num,field in enumerate(fields):
+                msg=f"""{Fore.light_green}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct} -> {Fore.orange_red_1}EntryDataExtra{Fore.light_cyan}(
+ede_id={Fore.light_steel_blue}{field.ede_id}{Fore.light_cyan},
+doe={Fore.light_steel_blue}{field.doe}{Fore.light_cyan},
+field_name={Fore.light_steel_blue}{field.field_name}{Fore.light_cyan},
+field_value={Fore.light_steel_blue}{field.field_value}{Fore.light_cyan},
+){Style.reset}"""
+                yield num,ct,field,msg
+
+    def list_all_fields(self):
+        with Session(ENGINE) as session:
+            fields=session.query(EntryDataExtras).group_by(EntryDataExtras.field_name,EntryDataExtras.field_type).order_by(EntryDataExtras.doe).all()
+            ct=len(fields)
+            for num,field in enumerate(fields):
+                msg=f"""{Fore.light_green}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct} -> {Fore.orange_red_1}EntryDataExtra{Fore.light_cyan}(
+ede_id={Fore.light_steel_blue}{field.ede_id}{Fore.light_cyan},
+doe={Fore.light_steel_blue}{field.doe}{Fore.light_cyan},
+field_name={Fore.light_steel_blue}{field.field_name}{Fore.light_cyan},
+field_value={Fore.light_steel_blue}{field.field_value}{Fore.light_cyan},
+){Style.reset}"""
+                
+                print(msg)
 
-    def __init__(self):
-        cmds={
+    def __init__(self,code=None):
+        self.code=code
+        cmds=OrderedDict({
+            'list all extraPresets presets':{
+            'cmds':['la-xp','laxp','la xp','ls xtr prst','list extra preset'],
+            'exec':self.list_extraPresets_presets,
+            'desc':"list extra preset[These are hardcoded]."
+            },
+            'list all diabetic presets':{
+            'cmds':['la-dp','ladp','la dp','ls dbtc prst','list diabetic presets'],
+            'exec':self.list_diabetic_presets,
+            'desc':"list diabetic presets[These are hardcoded]."
+            },
+            'list all nutrients presets':{
+            'cmds':['la-np','lanp','la np','ls ntrnt prst','list nutrients presets'],
+            'exec':self.list_nutrient_presets,
+            'desc':"list nutrients presets[These are hardcoded]."
+            },
+            'list all available fields':{
+            'cmds':['la-af','laaf','la af','ls al avlbl flds','ls * flds','ls*flds','lsalflds'],
+            'exec':self.list_all_fields,
+            'desc':"list all available fields."
+            },
             'enable all nutritional facts':{
             'cmds':['eanf','enable all nutrional facts'],
             'exec':self.enable_all_nutritional_facts,
@@ -803,6 +1271,26 @@ class EntryDataExtrasMenu:
             'exec':self.delete_all_nutritional_facts,
             'desc':"Delete Entry placeholder for nutritional facts and all of its EntryDataExtras, and all other nutritional facts fields. There is a triple prompt before proceeding!!!"
             },
+            'enable all diabetic facts':{
+            'cmds':['eadf','enable all diabetic facts','enable diabetes'],
+            'exec':self.enable_all_diabetic_facts,
+            'desc':"add an Entry placeholder for diabetic facts and add all diabetic facts fields."
+            },
+            'delete and disable all diabetic facts':{
+            'cmds':['dadadf','delete and disable all diabetic facts','disable diabetes'],
+            'exec':self.delete_all_diabetic_facts,
+            'desc':"Delete Entry placeholder for diabetic facts and all of its EntryDataExtras, and all other diabetic facts fields. There is a triple prompt before proceeding!!!"
+            },
+            'enable all extraPresets facts':{
+            'cmds':['eaxpf','enable all extrapresets facts','enable extrapresets'],
+            'exec':self.enable_all_extraPresets_facts,
+            'desc':"add an Entry placeholder for extraPresets facts and add all extraPresets facts fields."
+            },
+            'delete and disable all extraPresets facts':{
+            'cmds':['dadaxpf','delete and disable all extrapresets facts','disable extrapresets'],
+            'exec':self.delete_all_extraPresets_facts,
+            'desc':"Delete Entry placeholder for extraPresets facts and all of its EntryDataExtras, and all other extraPresets facts fields. There is a triple prompt before proceeding!!!"
+            },
             'af2e':{
             'cmds':['af2e','add field to entry','add field 2 entry'],
             'exec':self.af2e,
@@ -843,7 +1331,7 @@ class EntryDataExtrasMenu:
             'exec':self.edee,
             'desc':'ensures last used field is applied to all Entry\'s [SLOW!!!]',
             }
-        }
+        })
         '''
 elif doWhat.lower() in "sch f2e,ssf2e".split(","):
                 self.sch_f2e()
@@ -862,8 +1350,9 @@ elif doWhat.lower() in "sch f2e,ssf2e".split(","):
                         break
         '''
         helpText=[]
-        for m in cmds:
-            helpText.append(f"{cmds[m]['cmds']} - {cmds[m]['desc']}")
+        ct=len(cmds)
+        for num,m in enumerate(cmds):
+            helpText.append(self.colorize(f"{Fore.light_steel_blue}{cmds[m]['cmds']}{Fore.grey_70} - {Fore.light_steel_blue}{cmds[m]['desc']}{Style.reset}",num,ct))
         helpText='\n'.join(helpText)
         while True:
             doWhat=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"EntryDataExtras@{Fore.light_green}Menu{Fore.light_yellow}",helpText=helpText,data="string")

radboy/TasksMode/Tasks.py

@@ -1093,7 +1093,7 @@ so use {Fore.orange_red_1}ls-lq/ls Shelf {Fore.light_yellow}from {Fore.light_mag
                 if doWhat in [None,]:
                     return
                 elif doWhat.lower() in ['em','extras menu']:
-                    EntryDataExtrasMenu()
+                    EntryDataExtrasMenu(code=code)
                 elif doWhat.lower() in ['nfa',f"nfa","new entry from all","new_entry_from_all","nefa"]:
                     self.NewEntryAll()
                 elif doWhat.lower() in ['edit entry',f"ee","ed en"]:
@@ -1863,6 +1863,70 @@ so use {Fore.orange_red_1}ls-lq/ls Shelf {Fore.light_yellow}from {Fore.light_mag
     entrySepStart=f'{Back.grey_30}{Fore.light_red}\\\\{Fore.light_green}{"*"*10}{Fore.light_yellow}|{Fore.light_steel_blue}#REPLACE#{Fore.light_magenta}|{Fore.orange_red_1}{"+"*10}{Fore.light_yellow}{Style.bold}({today()}){Fore.light_red}//{Style.reset}'
     entrySepEnd=f'{Back.grey_30}{Fore.light_red}\\\\{Fore.orange_red_1}{"+"*10}{Fore.light_yellow}|{Fore.light_steel_blue}#REPLACE#{Fore.light_magenta}|{Fore.light_green}{"*"*10}{Fore.light_yellow}{Style.bold}({today()}){Fore.light_red}//{Style.reset}'
     def setFieldInList(self,fieldname,load=False,repack_exec=None,barcode=None,only_select_qty=False):
+        def hnf(resultx,fieldname,code):
+                            if isinstance(resultx,Entry):
+                                with Session(ENGINE) as session:
+                                    result=session.query(Entry).filter(Entry.EntryId==resultx.EntryId).first()
+
+                                    if result.Price is None:
+                                        result.Price=0
+                                    if result.Tax is None:
+                                        result.Tax=0
+                                    if result.CRV is None:
+                                        result.CRV=0
+                                    for k in ['PalletCount','ShelfCount','LoadCount','CaseCount','Facings']:
+                                        if getattr(result,k) < 1 or getattr(result,k) == None:
+                                            setattr(result,k,1)
+                                            session.commit()
+                                            session.flush()
+                                            session.refresh(result)
+                                    palletcount=result.PalletCount
+                                    facings=result.Facings
+                                    shelfcount=result.ShelfCount
+                                    loadcount=result.LoadCount
+                                    casecount=result.CaseCount
+                                    Name=result.Name
+                                    BCD=result.Barcode
+                                    CD=result.Code
+                                    ABCD=result.ALT_Barcode 
+                                    ci=getattr(result,fieldname)
+                                    code=result.Barcode
+                                    mkTextStore=deepcopy(result)
+                                    total_price=0
+                                    if result.Tax == 0:
+                                        total_price=round(result.Price+result.CRV,3)
+                                    else:
+                                        total_price=round(round(result.Price+result.Tax,3)+round(result.CRV,3),3)
+
+                                    hafnhaf_l=f'''{Fore.grey_70}[{Fore.light_steel_blue}ListMode Entry Info{Fore.grey_70}]{Style.reset}
+{Fore.orange_red_1}Cost({Fore.light_red}${Fore.light_green}{round(total_price,3)}({Fore.light_steel_blue}Price({round(result.Price,3)}),{Fore.light_sea_green}CRV({round(result.CRV,3)}),{Fore.spring_green_3a}Tax({round(result.Tax,3)}){Fore.light_green}){Style.reset}                            
+{Fore.light_green}CaseCount={Fore.cyan}{casecount}{Style.reset}|{Fore.medium_violet_red}ShelfCount={Fore.light_magenta}{shelfcount}{Style.reset}|{Fore.orange_red_1}Facings={Fore.turquoise_4}{facings}{Style.reset}
+{Fore.green_yellow}LoadCount={Fore.dark_goldenrod}{loadcount}{Style.reset}|{Fore.light_red}PalletCount={Fore.orange_red_1}{palletcount}|{Fore.spring_green_3a}{fieldname}={Fore.light_sea_green}{ci}{Style.reset}
+{Fore.cyan}Name{Fore.light_steel_blue}={Name}{Style.reset}
+{Fore.dark_goldenrod}Barcode={Fore.light_green}{result.rebar()}|{Style.reset}{Fore.light_sea_green}ALT_Barcode={Fore.turquoise_4}{ABCD}{Style.reset}
+{Style.bold}{Fore.light_sea_green}Code={Fore.spring_green_3a}{Entry.cfmt(None,CD)}{Style.reset}'''
+                                ptext=f'''{hafnhaf_l}
+{Fore.light_red}Enter {Style.bold}{Style.underline}{Fore.orange_red_1}Quantity/Formula{Style.reset} amount|+amount|-amount|a,+a,-a(advanced)|r,+r,-r(ReParseFormula) (Enter==1)|{Fore.light_green}ipcv={Fore.dark_goldenrod}PalletCount-value[{Fore.light_steel_blue}:-){Fore.dark_goldenrod}]|{Fore.light_green}iscv={Fore.dark_goldenrod}ShelfCount-value[{Fore.light_steel_blue}:-(){Fore.dark_goldenrod}]|{Fore.light_green}ilcv={Fore.dark_goldenrod}LoadCount-value[{Fore.light_steel_blue};-){Fore.dark_goldenrod}]|{Fore.light_green}iccv={Fore.dark_goldenrod}CaseCount-value[{Fore.light_steel_blue}:-P{Fore.dark_goldenrod}]|{Fore.light_green}ipcvc{Fore.dark_goldenrod}=(PalletCount-value)/CaseCount[{Fore.light_steel_blue}:-D{Fore.dark_goldenrod}]|{Fore.light_green}iscvc{Fore.dark_goldenrod}=(ShelfCount-value)/CaseCount[{Fore.light_steel_blue}:-|{Fore.dark_goldenrod}]|{Fore.light_green}ilcvc{Fore.dark_goldenrod}=(LoadCount-value)/CaseCount[{Fore.light_steel_blue}:-*{Fore.dark_goldenrod}]|{Fore.light_green}iccvc{Fore.dark_goldenrod}=(CaseCount-value)/CaseCount[{Fore.light_steel_blue}:O{Fore.dark_goldenrod}]{Style.reset}'''
+                            else:
+                                casecount=0
+                                shelfcount=0
+                                facings=0
+                                loadcount=0
+                                palletcount=0
+                                Name=code
+                                BCD=code
+                                ABCD=''
+                                CD=code
+                                ci=0
+                                hafnhaf_l=f'''{Fore.grey_70}[{Fore.light_steel_blue}ListMode Entry Info{Fore.grey_70}]{Style.reset}
+{Fore.light_green}CaseCount={Fore.cyan}{casecount}{Style.reset}|{Fore.medium_violet_red}ShelfCount={Fore.light_magenta}{shelfcount}{Style.reset}|{Fore.orange_red_1}Facings={Fore.turquoise_4}{facings}{Style.reset}
+{Fore.green_yellow}LoadCount={Fore.dark_goldenrod}{loadcount}{Style.reset}|{Fore.light_red}PalletCount={Fore.orange_red_1}{palletcount}|{Fore.spring_green_3a}{fieldname}={Fore.light_sea_green}{ci}{Style.reset}
+{Fore.cyan}Name{Fore.light_steel_blue}={Name}{Style.reset}
+{Fore.dark_goldenrod}Barcode={Fore.light_green}{BCD}|{Style.reset}{Fore.light_sea_green}ALT_Barcode={Fore.turquoise_4}{ABCD}{Style.reset}
+{Style.bold}{Fore.orange_red_1}Code={Fore.spring_green_3a}{CD}{Style.reset}'''
+                            ptext=f'''{hafnhaf_l}
+{Fore.light_red}Enter {Style.bold}{Style.underline}{Fore.orange_red_1}Quantity/Formula{Style.reset} amount|+amount|-amount|a,+a,-a(advanced)|r,+r,-r(ReParseFormula) (Enter==1)|{Fore.light_green}ipcv={Fore.dark_goldenrod}PalletCount-value[{Fore.light_steel_blue}:-){Fore.dark_goldenrod}]|{Fore.light_green}iscv={Fore.dark_goldenrod}ShelfCount-value[{Fore.light_steel_blue}:-(){Fore.dark_goldenrod}]|{Fore.light_green}ilcv={Fore.dark_goldenrod}LoadCount-value[{Fore.light_steel_blue};-){Fore.dark_goldenrod}]|{Fore.light_green}iccv={Fore.dark_goldenrod}CaseCount-value[{Fore.light_steel_blue}:-P{Fore.dark_goldenrod}]|{Fore.light_green}ipcvc{Fore.dark_goldenrod}=(PalletCount-value)/CaseCount[{Fore.light_steel_blue}:-D{Fore.dark_goldenrod}]|{Fore.light_green}iscvc{Fore.dark_goldenrod}=(ShelfCount-value)/CaseCount[{Fore.light_steel_blue}:-|{Fore.dark_goldenrod}]|{Fore.light_green}ilcvc{Fore.dark_goldenrod}=(LoadCount-value)/CaseCount[{Fore.light_steel_blue}:-*{Fore.dark_goldenrod}]|{Fore.light_green}iccvc{Fore.dark_goldenrod}=(CaseCount-value)/CaseCount[{Fore.light_steel_blue}:O{Fore.dark_goldenrod}]{Style.reset}'''
+                            return ptext
         default_quantity_action=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Set The Default Quantity to the quantity retrieved + this value? 'd'=1",helpText="a positive(+) or Negative(-) integer.",data="float")
 
         if default_quantity_action in [None,]:
@@ -2382,11 +2446,11 @@ Location Fields:
                            
 
                             hafnhaf=f'''{Fore.grey_70}[{Fore.light_steel_blue}ListMode Entry Info{Fore.grey_70}]{Style.reset}
-    {Fore.light_green}CaseCount={Fore.cyan}{casecount}{Style.reset}|{Fore.medium_violet_red}ShelfCount={Fore.light_magenta}{shelfcount}{Style.reset}|{Fore.orange_red_1}Facings={Fore.turquoise_4}{facings}{Style.reset}
-    {Fore.green_yellow}LoadCount={Fore.dark_goldenrod}{loadcount}{Style.reset}|{Fore.light_red}PalletCount={Fore.orange_red_1}{palletcount}|{Fore.spring_green_3a}{fieldname}={Fore.light_sea_green}{ci}{Style.reset}
-    {Fore.cyan}Name{Fore.light_steel_blue}={Name}{Style.reset}
-    {Fore.dark_goldenrod}Barcode={Fore.light_green}{BCD}|{Style.reset}{Fore.light_sea_green}ALT_Barcode={Fore.turquoise_4}{ABCD}{Style.reset}
-    {Style.bold}{Fore.orange_red_1}Code={Fore.spring_green_3a}{CD}{Style.reset}'''
+{Fore.light_green}CaseCount={Fore.cyan}{casecount}{Style.reset}|{Fore.medium_violet_red}ShelfCount={Fore.light_magenta}{shelfcount}{Style.reset}|{Fore.orange_red_1}Facings={Fore.turquoise_4}{facings}{Style.reset}
+{Fore.green_yellow}LoadCount={Fore.dark_goldenrod}{loadcount}{Style.reset}|{Fore.light_red}PalletCount={Fore.orange_red_1}{palletcount}|{Fore.spring_green_3a}{fieldname}={Fore.light_sea_green}{ci}{Style.reset}
+{Fore.cyan}Name{Fore.light_steel_blue}={Name}{Style.reset}
+{Fore.dark_goldenrod}Barcode={Fore.light_green}{BCD}|{Style.reset}{Fore.light_sea_green}ALT_Barcode={Fore.turquoise_4}{ABCD}{Style.reset}
+{Style.bold}{Fore.orange_red_1}Code={Fore.spring_green_3a}{CD}{Style.reset}'''
                             if isinstance(result,Entry):
                                 if result.Price is None:
                                     result.Price=0
@@ -2417,12 +2481,12 @@ Location Fields:
                                 else:
                                     total_price=round(round(result.Price+result.Tax,3)+round(result.CRV,3),3)
                                 hafnhaf=f'''{Fore.grey_70}[{Fore.light_steel_blue}ListMode Entry Info{Fore.grey_70}]
-    {Fore.orange_red_1}Cost({Fore.light_red}${Fore.light_green}{round(total_price,3)}({Fore.light_steel_blue}Price({round(result.Price,3)}),{Fore.light_sea_green}CRV({round(result.CRV,3)}),{Fore.spring_green_3a}Tax({round(result.Tax,3)}){Fore.light_green}){Style.reset}
-    {Style.reset}{Fore.light_green}CaseCount={Fore.cyan}{casecount}{Style.reset}|{Fore.medium_violet_red}ShelfCount={Fore.light_magenta}{shelfcount}{Style.reset}|{Fore.orange_red_1}Facings={Fore.turquoise_4}{facings}{Style.reset}
-    {Fore.green_yellow}LoadCount={Fore.dark_goldenrod}{loadcount}{Style.reset}|{Fore.light_red}PalletCount={Fore.orange_red_1}{palletcount}|{Fore.spring_green_3a}{fieldname}={Fore.light_sea_green}{ci}{Style.reset}
-    {Fore.cyan}Name{Fore.light_steel_blue}={Name}{Style.reset}
-    {Fore.dark_goldenrod}Barcode={Fore.light_green}{result.rebar()}|{Style.reset}{Fore.light_sea_green}ALT_Barcode={Fore.turquoise_4}{ABCD}{Style.reset}
-    {Style.bold}{Fore.light_sea_green}Code={Fore.spring_green_3a}{Entry.cfmt(None,CD)}{Style.reset}'''
+{Fore.orange_red_1}Cost({Fore.light_red}${Fore.light_green}{round(total_price,3)}({Fore.light_steel_blue}Price({round(result.Price,3)}),{Fore.light_sea_green}CRV({round(result.CRV,3)}),{Fore.spring_green_3a}Tax({round(result.Tax,3)}){Fore.light_green}){Style.reset}
+{Style.reset}{Fore.light_green}CaseCount={Fore.cyan}{casecount}{Style.reset}|{Fore.medium_violet_red}ShelfCount={Fore.light_magenta}{shelfcount}{Style.reset}|{Fore.orange_red_1}Facings={Fore.turquoise_4}{facings}{Style.reset}
+{Fore.green_yellow}LoadCount={Fore.dark_goldenrod}{loadcount}{Style.reset}|{Fore.light_red}PalletCount={Fore.orange_red_1}{palletcount}|{Fore.spring_green_3a}{fieldname}={Fore.light_sea_green}{ci}{Style.reset}
+{Fore.cyan}Name{Fore.light_steel_blue}={Name}{Style.reset}
+{Fore.dark_goldenrod}Barcode={Fore.light_green}{result.rebar()}|{Style.reset}{Fore.light_sea_green}ALT_Barcode={Fore.turquoise_4}{ABCD}{Style.reset}
+{Style.bold}{Fore.light_sea_green}Code={Fore.spring_green_3a}{Entry.cfmt(None,CD)}{Style.reset}'''
 
                             print(hafnhaf)
                             results=session.query(Entry).filter(or_(Entry.Barcode==code,Entry.Barcode.icontains(code),Entry.Code.icontains(code),Entry.Code==code,Entry.ALT_Barcode==code)).all()
@@ -2525,70 +2589,7 @@ Location Fields:
                         
                         ptext=f'''{hafnhaf}
 {Fore.light_red}Enter {Style.bold}{Style.underline}{Fore.orange_red_1}Quantity/Formula{Style.reset} amount|+amount|-amount|a,+a,-a(advanced)|r,+r,-r(ReParseFormula) (Enter==1)|{Fore.light_green}ipcv={Fore.dark_goldenrod}PalletCount-value[{Fore.light_steel_blue}:-){Fore.dark_goldenrod}]|{Fore.light_green}iscv={Fore.dark_goldenrod}ShelfCount-value[{Fore.light_steel_blue}:-(){Fore.dark_goldenrod}]|{Fore.light_green}ilcv={Fore.dark_goldenrod}LoadCount-value[{Fore.light_steel_blue};-){Fore.dark_goldenrod}]|{Fore.light_green}iccv={Fore.dark_goldenrod}CaseCount-value[{Fore.light_steel_blue}:-P{Fore.dark_goldenrod}]|{Fore.light_green}ipcvc{Fore.dark_goldenrod}=(PalletCount-value)/CaseCount[{Fore.light_steel_blue}:-D{Fore.dark_goldenrod}]|{Fore.light_green}iscvc{Fore.dark_goldenrod}=(ShelfCount-value)/CaseCount[{Fore.light_steel_blue}:-|{Fore.dark_goldenrod}]|{Fore.light_green}ilcvc{Fore.dark_goldenrod}=(LoadCount-value)/CaseCount[{Fore.light_steel_blue}:-*{Fore.dark_goldenrod}]|{Fore.light_green}iccvc{Fore.dark_goldenrod}=(CaseCount-value)/CaseCount[{Fore.light_steel_blue}:O{Fore.dark_goldenrod}]{Style.reset}'''
-                        def hnf(resultx,fieldname,code):
-                            if isinstance(resultx,Entry):
-                                with Session(ENGINE) as session:
-                                    result=session.query(Entry).filter(Entry.EntryId==resultx.EntryId).first()
-
-                                    if result.Price is None:
-                                        result.Price=0
-                                    if result.Tax is None:
-                                        result.Tax=0
-                                    if result.CRV is None:
-                                        result.CRV=0
-                                    for k in ['PalletCount','ShelfCount','LoadCount','CaseCount','Facings']:
-                                        if getattr(result,k) < 1 or getattr(result,k) == None:
-                                            setattr(result,k,1)
-                                            session.commit()
-                                            session.flush()
-                                            session.refresh(result)
-                                    palletcount=result.PalletCount
-                                    facings=result.Facings
-                                    shelfcount=result.ShelfCount
-                                    loadcount=result.LoadCount
-                                    casecount=result.CaseCount
-                                    Name=result.Name
-                                    BCD=result.Barcode
-                                    CD=result.Code
-                                    ABCD=result.ALT_Barcode 
-                                    ci=getattr(result,fieldname)
-                                    code=result.Barcode
-                                    mkTextStore=deepcopy(result)
-                                    total_price=0
-                                    if result.Tax == 0:
-                                        total_price=round(result.Price+result.CRV,3)
-                                    else:
-                                        total_price=round(round(result.Price+result.Tax,3)+round(result.CRV,3),3)
-
-                                    hafnhaf_l=f'''{Fore.grey_70}[{Fore.light_steel_blue}ListMode Entry Info{Fore.grey_70}]{Style.reset}
-{Fore.orange_red_1}Cost({Fore.light_red}${Fore.light_green}{round(total_price,3)}({Fore.light_steel_blue}Price({round(result.Price,3)}),{Fore.light_sea_green}CRV({round(result.CRV,3)}),{Fore.spring_green_3a}Tax({round(result.Tax,3)}){Fore.light_green}){Style.reset}                            
-{Fore.light_green}CaseCount={Fore.cyan}{casecount}{Style.reset}|{Fore.medium_violet_red}ShelfCount={Fore.light_magenta}{shelfcount}{Style.reset}|{Fore.orange_red_1}Facings={Fore.turquoise_4}{facings}{Style.reset}
-{Fore.green_yellow}LoadCount={Fore.dark_goldenrod}{loadcount}{Style.reset}|{Fore.light_red}PalletCount={Fore.orange_red_1}{palletcount}|{Fore.spring_green_3a}{fieldname}={Fore.light_sea_green}{ci}{Style.reset}
-{Fore.cyan}Name{Fore.light_steel_blue}={Name}{Style.reset}
-{Fore.dark_goldenrod}Barcode={Fore.light_green}{result.rebar()}|{Style.reset}{Fore.light_sea_green}ALT_Barcode={Fore.turquoise_4}{ABCD}{Style.reset}
-{Style.bold}{Fore.light_sea_green}Code={Fore.spring_green_3a}{Entry.cfmt(None,CD)}{Style.reset}'''
-                                ptext=f'''{hafnhaf_l}
-{Fore.light_red}Enter {Style.bold}{Style.underline}{Fore.orange_red_1}Quantity/Formula{Style.reset} amount|+amount|-amount|a,+a,-a(advanced)|r,+r,-r(ReParseFormula) (Enter==1)|{Fore.light_green}ipcv={Fore.dark_goldenrod}PalletCount-value[{Fore.light_steel_blue}:-){Fore.dark_goldenrod}]|{Fore.light_green}iscv={Fore.dark_goldenrod}ShelfCount-value[{Fore.light_steel_blue}:-(){Fore.dark_goldenrod}]|{Fore.light_green}ilcv={Fore.dark_goldenrod}LoadCount-value[{Fore.light_steel_blue};-){Fore.dark_goldenrod}]|{Fore.light_green}iccv={Fore.dark_goldenrod}CaseCount-value[{Fore.light_steel_blue}:-P{Fore.dark_goldenrod}]|{Fore.light_green}ipcvc{Fore.dark_goldenrod}=(PalletCount-value)/CaseCount[{Fore.light_steel_blue}:-D{Fore.dark_goldenrod}]|{Fore.light_green}iscvc{Fore.dark_goldenrod}=(ShelfCount-value)/CaseCount[{Fore.light_steel_blue}:-|{Fore.dark_goldenrod}]|{Fore.light_green}ilcvc{Fore.dark_goldenrod}=(LoadCount-value)/CaseCount[{Fore.light_steel_blue}:-*{Fore.dark_goldenrod}]|{Fore.light_green}iccvc{Fore.dark_goldenrod}=(CaseCount-value)/CaseCount[{Fore.light_steel_blue}:O{Fore.dark_goldenrod}]{Style.reset}'''
-                            else:
-                                casecount=0
-                                shelfcount=0
-                                facings=0
-                                loadcount=0
-                                palletcount=0
-                                Name=code
-                                BCD=code
-                                ABCD=''
-                                CD=code
-                                ci=0
-                                hafnhaf_l=f'''{Fore.grey_70}[{Fore.light_steel_blue}ListMode Entry Info{Fore.grey_70}]{Style.reset}
-{Fore.light_green}CaseCount={Fore.cyan}{casecount}{Style.reset}|{Fore.medium_violet_red}ShelfCount={Fore.light_magenta}{shelfcount}{Style.reset}|{Fore.orange_red_1}Facings={Fore.turquoise_4}{facings}{Style.reset}
-{Fore.green_yellow}LoadCount={Fore.dark_goldenrod}{loadcount}{Style.reset}|{Fore.light_red}PalletCount={Fore.orange_red_1}{palletcount}|{Fore.spring_green_3a}{fieldname}={Fore.light_sea_green}{ci}{Style.reset}
-{Fore.cyan}Name{Fore.light_steel_blue}={Name}{Style.reset}
-{Fore.dark_goldenrod}Barcode={Fore.light_green}{BCD}|{Style.reset}{Fore.light_sea_green}ALT_Barcode={Fore.turquoise_4}{ABCD}{Style.reset}
-{Style.bold}{Fore.orange_red_1}Code={Fore.spring_green_3a}{CD}{Style.reset}'''
-                            ptext=f'''{hafnhaf_l}
-{Fore.light_red}Enter {Style.bold}{Style.underline}{Fore.orange_red_1}Quantity/Formula{Style.reset} amount|+amount|-amount|a,+a,-a(advanced)|r,+r,-r(ReParseFormula) (Enter==1)|{Fore.light_green}ipcv={Fore.dark_goldenrod}PalletCount-value[{Fore.light_steel_blue}:-){Fore.dark_goldenrod}]|{Fore.light_green}iscv={Fore.dark_goldenrod}ShelfCount-value[{Fore.light_steel_blue}:-(){Fore.dark_goldenrod}]|{Fore.light_green}ilcv={Fore.dark_goldenrod}LoadCount-value[{Fore.light_steel_blue};-){Fore.dark_goldenrod}]|{Fore.light_green}iccv={Fore.dark_goldenrod}CaseCount-value[{Fore.light_steel_blue}:-P{Fore.dark_goldenrod}]|{Fore.light_green}ipcvc{Fore.dark_goldenrod}=(PalletCount-value)/CaseCount[{Fore.light_steel_blue}:-D{Fore.dark_goldenrod}]|{Fore.light_green}iscvc{Fore.dark_goldenrod}=(ShelfCount-value)/CaseCount[{Fore.light_steel_blue}:-|{Fore.dark_goldenrod}]|{Fore.light_green}ilcvc{Fore.dark_goldenrod}=(LoadCount-value)/CaseCount[{Fore.light_steel_blue}:-*{Fore.dark_goldenrod}]|{Fore.light_green}iccvc{Fore.dark_goldenrod}=(CaseCount-value)/CaseCount[{Fore.light_steel_blue}:O{Fore.dark_goldenrod}]{Style.reset}'''
-                            return ptext
+                        
                         p=Prompt.__init2__(None,func=mkT,ptext=f"{ptext}",helpText=self.helpText_barcodes.replace('#CODE#',code_log),data=code,qc=lambda self=self,code=code:self.NewEntryMenu(code=code),replace_ptext=lambda result=result,fieldname=fieldname,code=code:hnf(resultx=result,fieldname=fieldname,code=code))
                         if self.next_barcode():
                             continue

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.350'
+VERSION='0.0.352'

{radboy-0.0.350.dist-info → radboy-0.0.352.dist-info}/METADATA

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

{radboy-0.0.350.dist-info → radboy-0.0.352.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=XXy-o5Z_yOgrgHNju4iqM3h7xhRBkNIoHG1qePtBnGY,41316
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=UxllezpVER4W3-s0B20FU2NVv90oU07BTQec1k5hR5k,17
+radboy/__init__.py,sha256=_oBxnLh0Z3XVfFIPnmK_QBIMvDPa_I9ciceP1jg_iVM,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
@@ -90,7 +90,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=bTY303S1dqV5cv2JAlddtaVDMmjT5CTJTQi9KjVcUsk,228153
+radboy/DB/db.py,sha256=FuCvGyUuqaWZeh2UAIQqgGXxO8cq1D1E5lBmxYmyKOI,228386
 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
@@ -107,7 +107,7 @@ radboy/DB/__pycache__/FormBuilder.cpython-312.pyc,sha256=p1o-5SMRL8OXP_XQ5liUpf-
 radboy/DB/__pycache__/PrintLogging.cpython-312.pyc,sha256=pIAFqTi6OiQQORSc-oMH1zAbsdH7sY1TifxrN_QOvnU,148
 radboy/DB/__pycache__/Prompt.cpython-311.pyc,sha256=P2uPRpeqfLFtxieZ0JHBG3X_HZzWUCsFSLb_fpRqky0,6407
 radboy/DB/__pycache__/Prompt.cpython-312.pyc,sha256=6CcQ1gE2hcz3cKPjo4f6d7xNM2PTDnl8NzQG0Pme5BE,142886
-radboy/DB/__pycache__/Prompt.cpython-313.pyc,sha256=R90E6aGMoCmgfeEQkcUIOGhKJGseXxbtsdAR8BFkDU0,265793
+radboy/DB/__pycache__/Prompt.cpython-313.pyc,sha256=0EaNIUpsufPXdLezWNCqsdbixkFe3HZT2ZJAm04l7Mc,265793
 radboy/DB/__pycache__/RandomStringUtil.cpython-312.pyc,sha256=TrbEY89MuLmNlvoo5d8vOE6Dyshh5_EMlTZvk8MDVN4,48597
 radboy/DB/__pycache__/RandomStringUtil.cpython-313.pyc,sha256=MCcgVwV2Y-9rAY2FVaJZCKcou3HDX70EZudoiCigT0o,49217
 radboy/DB/__pycache__/ResetTools.cpython-311.pyc,sha256=4Vyc57iAAF0yRPjjglnVKovnTn8OoFIi6Zok3Wpj_YM,9292
@@ -125,7 +125,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=phmHMqSUXsdVI60Lu8o4MTHP0ERzY1xU3RUIoTxZIL8,359887
+radboy/DB/__pycache__/db.cpython-313.pyc,sha256=Y8TFajotRXIsYOWn-G6FN9Az3kOlZ60P9rFmGBEjvTM,360066
 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
@@ -144,10 +144,10 @@ radboy/DayLog/__pycache__/DayLogger.cpython-313.pyc,sha256=UC2v9eX_1UZNgIA9baQzr
 radboy/DayLog/__pycache__/__init__.cpython-311.pyc,sha256=Z5Y4DdVF77LZf6-Of92MDGFdi-IXik1ASQd4AdLNNfQ,231
 radboy/DayLog/__pycache__/__init__.cpython-312.pyc,sha256=lP_GHzSPt5JTrT1jLWiRMFGPmSdJYBn4eRV__OxgJ6s,269
 radboy/DayLog/__pycache__/__init__.cpython-313.pyc,sha256=UQw5v4r7yismC9qcqP0dEme6h-lawbOA5pXYpkqUwFk,148
-radboy/EntryExtras/Extras.py,sha256=oft3lI6REDQjw_SWzEClSl7hw8seOjGC5MvASZ29AGY,41228
+radboy/EntryExtras/Extras.py,sha256=4z1hp3CZpia-4Y6cbmv1iyzUHUyv3MnVqlZWGmNNKVw,66933
 radboy/EntryExtras/__init__.py,sha256=K76Ku7o2DwTZU-Ya2mifH856KAcxb8MXdSaQMQLhu84,902
 radboy/EntryExtras/__pycache__/Extras.cpython-312.pyc,sha256=eHkeyKblMtG37lDhl38OEGQbvvKxXMriKK49kj2mg8o,34768
-radboy/EntryExtras/__pycache__/Extras.cpython-313.pyc,sha256=cYtyQMRPXymNtxQC2Pcv1L5RbyBeAcp37pi4AHiDVrs,51806
+radboy/EntryExtras/__pycache__/Extras.cpython-313.pyc,sha256=V7jYgyWJwgUr7FIDKnmlX7WFXNtig19rJKjnm_dLUJw,86179
 radboy/EntryExtras/__pycache__/__init__.cpython-312.pyc,sha256=0bBwhp_9PYvL-Nm_J0gsYf9yfKAFJMiMdpc6XzZrPzU,829
 radboy/EntryExtras/__pycache__/__init__.cpython-313.pyc,sha256=PqXXfBeREZI2pZc22BayKH7daLXbO7p3NozaXpnA3cQ,829
 radboy/EntryExtras/__pycache__/db.cpython-312.pyc,sha256=Qcqix5yi9h7fbsmGhJOWYdLHbHMTWixwolRRQYg8ISk,1781
@@ -330,7 +330,7 @@ radboy/SystemSettings/__pycache__/__init__.cpython-312.pyc,sha256=aIzp4Po0t8EhSA
 radboy/SystemSettings/__pycache__/__init__.cpython-313.pyc,sha256=QFDuoidxMWsGVLsy5lN-rDs6TP8nKJ4yyCyiamNOhwo,156
 radboy/TasksMode/ReFormula.py,sha256=REDRJYub-OEOE6g14oRQOLOQwv8pHqVJy4NQk3CCM90,2255
 radboy/TasksMode/SetEntryNEU.py,sha256=3nUNDUNyxq4zeMtmUQ7aS1o23P7KhDIMdUPNqPnYbRk,17343
-radboy/TasksMode/Tasks.py,sha256=jlBUFX5igwjLPtcEdnLs1kPRDid17SUsIv3FIMtMR84,300792
+radboy/TasksMode/Tasks.py,sha256=DNPPnCth3tmV8dsvAdJrAp2187DRT1gMjxs78HWyhHg,300766
 radboy/TasksMode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/TasksMode/__pycache__/ReFormula.cpython-311.pyc,sha256=QEG3PwVw-8HTd_Mf9XbVcxU56F1fC9yBqWXYPLC39DU,4865
 radboy/TasksMode/__pycache__/ReFormula.cpython-312.pyc,sha256=aX7BWm2PPjCTnxsbGUitR-2h9hq4AjaBiHMrUXvIl0Y,3967
@@ -339,7 +339,7 @@ radboy/TasksMode/__pycache__/SetEntryNEU.cpython-312.pyc,sha256=pCdFj61aPKkHL6Sv
 radboy/TasksMode/__pycache__/SetEntryNEU.cpython-313.pyc,sha256=leIelDzPrZE_YgKs0B99osmhyENYtYgi3ErgS2XqSPs,20088
 radboy/TasksMode/__pycache__/Tasks.cpython-311.pyc,sha256=6QOTJnLiXSKdF81hkhy3vyrz49PPhS20s5_0X52g3Hw,131120
 radboy/TasksMode/__pycache__/Tasks.cpython-312.pyc,sha256=hyJwdaYaaRLdcrNxgg36diJ5iijX5_3I0UAORsj-6LU,310295
-radboy/TasksMode/__pycache__/Tasks.cpython-313.pyc,sha256=ZRYY6kvK-g6Xm3xnaeZzFWNmkhBqHLVtK1OCwk98LvE,366224
+radboy/TasksMode/__pycache__/Tasks.cpython-313.pyc,sha256=e2FO5tj68YvLyDMr7RHHzwBHOfHcq0Sm945tHHk1HcE,366197
 radboy/TasksMode/__pycache__/__init__.cpython-311.pyc,sha256=PKV1JbihEacm639b53bZozRQvcllSkjGP3q8STVMxF4,234
 radboy/TasksMode/__pycache__/__init__.cpython-312.pyc,sha256=ERgnEvRMiGSecWp1BpNzLdSq_SdKw7GvFWUvUM7bLVw,272
 radboy/TasksMode/__pycache__/__init__.cpython-313.pyc,sha256=lvsTxukyvGKB3C0rdF9dQi_bvVh6ceDVINfwcuIsd0s,151
@@ -386,7 +386,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=RsRz4HFvfl4CaMi-UOQH9DOkgezZ-Ma6Eum40DDWHCg,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=L4tNvdvdn9QV04q8ekxMKvnkDbqMlIyIDTnkQc8CR8s,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
@@ -411,7 +411,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.350.dist-info/METADATA,sha256=8d6EwM0LMy5E_hyjdgzhZ2hsxvrf53U8O6NQCNQpk3o,794
-radboy-0.0.350.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.350.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.350.dist-info/RECORD,,
+radboy-0.0.352.dist-info/METADATA,sha256=dM7TGRzF6CHGv1QPhkmxEH8rWYCK7nS5Uf_OONuM0rA,794
+radboy-0.0.352.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.352.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.352.dist-info/RECORD,,