radboy 0.0.449__tar.gz → 0.0.451__tar.gz

{radboy-0.0.449 → radboy-0.0.451}/PKG-INFO

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

radboy-0.0.451/STDOUT.TXT

@@ -0,0 +1,15 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"hl"
+#USER INPUT# -> :"adrg"
+#USER INPUT# -> :"blue diamond"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"adrg"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.451"

{radboy-0.0.449 → radboy-0.0.451}/pyproject.toml

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

{radboy-0.0.449 → radboy-0.0.451}/radboy/DB/Prompt.py

@@ -957,9 +957,10 @@ class Prompt(object):
                     crv=Decimal("0.00")
                     tax=Decimal("0.0000")
                     tax_crv=Decimal("0.00")
-                    i.Tax=Decimal(i.Tax).quantize(Decimal("0.00"))
+                    i.Tax=Decimal(i.Tax).quantize(Decimal("0.0000"))
                     i.CRV=Decimal(i.CRV).quantize(Decimal("0.00"))
                     i.Price=Decimal(i.Price).quantize(Decimal("0.00"))
+                    taxRate=Decimal(i.Tax/(i.Price+i.CRV)).quantize(Decimal("0.0000"))
                     #print("#1")
                     if not minus:
                         for n2,f in enumerate(location_fields):
@@ -1026,6 +1027,7 @@ class Prompt(object):
  {Fore.medium_spring_green}= {Fore.slate_blue_1}TaxCRVTotal({tax_crv})+TotalPrice({total*i.Price})
  {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+tax+crv}){Style.reset}
 {Fore.medium_violet_red}PercentOfTotal({super_total}%) of FinalTotal({getSuperTotal(results,location_fields,colormapped)['final total']})
+{Fore.orange_red_1}TaxRate({taxRate})={Decimal(taxRate*100).quantize(Decimal("0.00"))}%{Style.reset}
 {'*'*os.get_terminal_size().columns}{Style.reset}"""
                     if bldlse:
                         db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)

{radboy-0.0.449 → radboy-0.0.451}/radboy/HealthLog/HealthLog.py

@@ -375,7 +375,7 @@ class HealthLogUi:
 			'add drug':{
 			'cmds':['adrg','add drug','add drg','adddrug','adrug'],
 			'desc':'Add a new drug consumption entry',
-			'exec':lambda self=self:self.add_healthlog_specific(useColumns=['DrugConsumed','DrugQtyConsumed','DrugQtyConsumedUnitName'])
+			'exec':lambda self=self:self.add_healthlog_specific(useColumns=['EntryBarcode','EntryName','DrugConsumed','DrugQtyConsumed','DrugQtyConsumedUnitName'])
 			},
 			'ls lai':{
 			'cmds':['ls lai','lslai','list long insulin','list long acting insulin'],

{radboy-0.0.449 → radboy-0.0.451}/radboy/TasksMode/Tasks.py

@@ -2021,8 +2021,11 @@ so use {Fore.orange_red_1}ls-lq/ls Shelf {Fore.light_yellow}from {Fore.light_mag
                                     else:
                                         total_price=round(round(result.Price+result.Tax,3)+round(result.CRV,3),3)
 
+                                    taxRate=Decimal(result.Tax/(result.Price+result.CRV)).quantize(Decimal("0.00000"))
+
                                     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.green_4}TaxRate({Fore.dodger_blue_2}{taxRate}{Fore.green_4})={Fore.dodger_blue_3}{Decimal(taxRate*100).quantize(Decimal("0.00"))}%{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}
@@ -2621,8 +2624,12 @@ Location Fields:
                                     total_price=round(result.Price+result.CRV,3)
                                 else:
                                     total_price=round(round(result.Price+result.Tax,3)+round(result.CRV,3),3)
+
+                                taxRate=Decimal(result.Tax/(result.Price+result.CRV)).quantize(Decimal("0.00000"))
+
                                 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}
+{Fore.green_4}TaxRate({Fore.dodger_blue_2}{taxRate}{Fore.green_4})={Fore.dodger_blue_3}{Decimal(taxRate*100).quantize(Decimal("0.00"))}%{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}
@@ -2728,9 +2735,12 @@ Location Fields:
                                 total_price=round(result.Price+result.CRV,3)
                             else:
                                 total_price=round(round(result.Price+result.Tax,3)+round(result.CRV,3),3)
+                            
+                            taxRate=Decimal(result.Tax/(result.Price+result.CRV)).quantize(Decimal("0.00000"))
 
                             hafnhaf=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.green_4}TaxRate({Fore.dodger_blue_2}{taxRate}{Fore.green_4})={Fore.dodger_blue_3}{Decimal(taxRate*100).quantize(Decimal("0.00"))}%{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}

radboy-0.0.451/radboy/__init__.py

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

{radboy-0.0.449 → radboy-0.0.451}/radboy.egg-info/PKG-INFO

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

{radboy-0.0.449 → radboy-0.0.451}/setup.py

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

radboy-0.0.449/STDOUT.TXT

@@ -1,8 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"ckbk"
-#USER INPUT# -> :"ttlrcp"
-#USER INPUT# -> :""
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.449"

radboy-0.0.449/radboy/__init__.py

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