radboy 0.0.544__tar.gz → 0.0.546__tar.gz

{radboy-0.0.544 → radboy-0.0.546}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.544
+Version: 0.0.546
 Summary: A Retail Calculator for Android/Linux
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

radboy-0.0.546/STDOUT.TXT

@@ -0,0 +1,18 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"price"
+#USER INPUT# -> :"fcmd"
+#USER INPUT# -> :"text"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"fcmd"
+#USER INPUT# -> :"crv"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"2.49"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"3"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.546"

{radboy-0.0.544 → radboy-0.0.546}/pyproject.toml

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

{radboy-0.0.544 → radboy-0.0.546}/radboy/DB/Prompt.py

@@ -56,7 +56,9 @@ def std_colorize(m,n,c,start=f"[Prompt]{Back.black}{Fore.pale_turquoise_1} Start
         else:
             msg=f'{start}{Fore.light_cyan}{n}/{Fore.green_yellow}{n+1}{Fore.orange_red_1} of {c} {Fore.light_salmon_1}{m}{Style.reset}{end}'
         return msg
-
+'''Formula/Price menu options'''
+PRICE=['quick price','qprc','price','prc']
+FMLA=['fmlau','formulae-u','pre-formula','formulas']
 def timedout(ptext,htext='',timeout_returnable="timeout"):
     try:
         while True:
@@ -2261,7 +2263,8 @@ CMD's are not final until ended with {Fore.magenta}{hw_delim}{Style.reset}""")
 {Fore.grey_70}**{Fore.light_green}'codify','format code','fcode'{Fore.light_steel_blue} Format input text to look '{db.Entry.cfmt(None,"TESTTEXT")}{Style.reset}'
 {Fore.grey_70}**{Fore.light_green}'upcify str','upcify.str','upcify-str','format upc str','fupcs'{Fore.light_steel_blue} Format input text to look and use formatted text as input-text'{db.Entry.rebar(None,"TESTTEXTUPCA")}{Style.reset}'
 {Fore.grey_70}**{Fore.light_green}'codify str','codify.str','codify-str','format code str','fcodes'{Fore.light_steel_blue} Format input text to look and use formatted text as input-text'{db.Entry.cfmt(None,"TESTTEXT")}{Style.reset}'
-{Fore.grey_70}**{Fore.light_green}'quick price','qprc','price'{Fore.light_steel_blue} Calculate price information using user provided data for an arbitrary product who Data is not in the Entry table{Style.reset}
+{Fore.grey_70}**{Fore.light_green}{PRICE}{Fore.light_steel_blue} Calculate price information using user provided data for an arbitrary product who Data is not in the Entry table{Style.reset}
+{Fore.grey_70}**{Fore.light_green}{FMLA}{Fore.light_steel_blue} use some pre-built formulas for returning values to the prompt{Style.reset}
 {Fore.grey_70}**{Fore.light_green}'mksl','make shopping list','p-slq','prompt slq','set list qty','slqp','slq-p'{Fore.light_steel_blue} make a list using {Fore.green_3a}slq{Fore.light_steel_blue} from {Fore.orange_red_1}Tasks.{Fore.light_red}TasksMode{Style.reset}
 {Fore.grey_70}**{Fore.light_green}'ic2oc','input code to output code'{Fore.light_steel_blue} Convert an input code to its neighboring format for view or input use{Style.reset}
 {Fore.grey_70}**{Fore.light_green}'uniq-rcpt-id','uniq rcpt id','unique_reciept_id','urid','unique reciept id','unique-reciept-id'{Fore.light_steel_blue} Generate Relavent Receipt Id to be searchable in DayLogger{Style.reset}
@@ -2608,15 +2611,22 @@ degress fahrenheite - degF
                         return func(result,data)
                     elif cmd.lower() in ["bldls","build","buildls","build list","bld ls",'lsbld','list build','ls bld','bld']:
                         bldls()
-                    elif cmd.lower() in ['quick price','qprc','price']:
-                        t=TM.Tasks.pricing(None)
+                    elif cmd.lower() in PRICE:
+                        t=TM.Tasks.TasksMode(parent=self,engine=db.ENGINE,init_only=True).pricing()
+                        if t is not None:
+                            print("returned")
+                            try:
+                                return func(str(t),data)
+                            except:
+                                return func(t,data)
+                    elif cmd.lower() in FMLA:
+                        t=TM.Tasks.TasksMode(parent=self,engine=db.ENGINE,init_only=True).formulaeu()
                         if t is not None:
                             print("returned")
                             try:
                                 return func(str(t),data)
                             except:
                                 return func(t,data)
-                           
                     elif cmd.lower() in ["bldlse","builde","buildlse","build list export ","bld ls exp",'elsbld','export list build','exp ls bld','ebld']:
                         bldls(bldlse=True)
                     elif cmd.lower() in ['sbld','search build','search_build','scan build','scan_bld']:

{radboy-0.0.544 → radboy-0.0.546}/radboy/HealthLog/HealthLog.py

@@ -815,7 +815,7 @@ class HealthLogUi:
 			'exec':lambda self=self:self.export_log_field(fields=['BloodSugar','BloodSugarUnitName','LongActingInsulinName','LongActingInsulinTaken','LongActingInsulinUnitName','ShortActingInsulinName','ShortActingInsulinTaken','ShortActingInsulinUnitName','HeartRate','HeartRateUnitName','DrugConsumed','DrugQtyConsumed','DrugQtyConsumedUnitName','CarboHydrateIntake','CarboHydrateIntakeUnitName','Comments',],not_none=['Comments',])
 			},
 			'xpt consumed':{
-				'cmds':['xptfd','xpt fd','xpt food','lfd','xpt fuel','xpt fl','xlfl'],
+				'cmds':['xptfd','xpt fd','xpt food','xpt-fd','xpt fuel','xpt fl','xlfl'],
 				'desc':'export food',
 				'exec':lambda self=self:self.export_log_field(
 					fields=["EntryBarcode",