radboy 0.0.575__tar.gz → 0.0.577__tar.gz

{radboy-0.0.575 → radboy-0.0.577}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.575
+Version: 0.0.577
 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.575 → radboy-0.0.577}/STDOUT.TXT

@@ -1,8 +1,9 @@
-#USER INPUT# -> :"hl"
-#USER INPUT# -> :"xpt all"
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"mksl"
 #USER INPUT# -> :""
 #USER INPUT# -> :""
 #USER INPUT# -> :""
 #USER INPUT# -> :"q"
 #USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.575"
+#USER INPUT# -> :"0.0.576"
+#USER INPUT# -> :"0.0.577"

{radboy-0.0.575 → radboy-0.0.577}/pyproject.toml

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

{radboy-0.0.575 → radboy-0.0.577}/radboy/DB/db.py

@@ -202,6 +202,34 @@ def strip_colors(colored_text):
 
 class BOOLEAN_ANSWERS:
     def __init__(self):
+        self.valid_fields=['Shelf',
+        'BackRoom',
+        'Display_1',
+        'Display_2',
+        'Display_3',
+        'Display_4',
+        'Display_5',
+        'Display_6',
+        'ALT_Barcode',
+        'DUP_Barcode',
+        'CaseID_BR',
+        'CaseID_LD',
+        'CaseID_6W',
+        'Tags',
+        'Facings',
+        'SBX_WTR_DSPLY',
+        'SBX_CHP_DSPLY',
+        'SBX_WTR_KLR',
+        'FLRL_CHP_DSPLY',
+        'FLRL_WTR_DSPLY',
+        'WD_DSPLY',
+        'CHKSTND_SPLY',
+        'Distress',
+        'Facings',
+        'UnitsDeep',
+        'UnitsHigh',
+        'ListQty'
+        ]
         self.HealthLogZip=Path("HealthLog.zip")
         self.IllegalCharsManifest=Path("IllegalCharsManifest.txt")
         self.yes=generate_cmds(startcmd=['y','Y','YES','1','t','true','TRUE','True'],endCmd=['',' '])
@@ -544,6 +572,13 @@ LOCATION_FIELDS=[
 
 
 def dayString(today,plain=False):
+    if isinstance(today,str):
+        print(today)
+        today=datetime.now()
+    if not isinstance(today,datetime):
+        print(today,type(today))
+        today=datetime.now()
+
     ds=f'''{today.strftime(f"{Fore.light_yellow}%m/{Fore.light_red}%d/{Fore.light_sea_green}%Y {Fore.light_red}(%A, {Fore.grey_50}Week {(today.day - 1) // 7 + 1} of {Fore.light_yellow}%B{Fore.grey_50}, week %W of {Fore.light_sea_green}year %Y){Fore.light_cyan} @ {Fore.orange_red_1}%H/{Fore.light_cyan}24.Hr|({Fore.dark_goldenrod}%I/{Fore.light_cyan}12.Hr){Fore.light_green}:%M.Min{Fore.magenta}:%S.Sec ({Fore.dark_goldenrod}%p/{Fore.light_cyan}12.Hr)")}'''
     if plain:
         return strip_colors(ds)

{radboy-0.0.575 → radboy-0.0.577}/radboy/TasksMode/Tasks.py

@@ -60,15 +60,27 @@ def totalDBItems():
     with Session(ENGINE) as session:
         total=0
         crv_items=0
+        crv_qty_items=0
         q=session.query(Entry).filter(Entry.InList==True)
         a=q.all()
 
         for i in a:
+            qty=0
+            
+            for f in BooleanAnswers.valid_fields:
+                value=getattr(i,f)
+                if value is not None:
+                    try:
+                        qty+=value
+                    except Exception as e:
+                        print(e)
+
             if i.CRV not in [0,None]:
                 total+=1
                 crv_items+=1
+                crv_qty_items+=qty
             total+=1
-        return f"(TTL ITM:{Fore.light_red}{total}{Fore.light_yellow},CRV ITM :{Fore.light_red}{crv_items}{Fore.light_yellow})"
+        return f"List(TTL ITM:{Fore.light_red}{total}{Fore.light_yellow},CRV ITM :{Fore.light_red}{crv_items}{Fore.light_yellow},CRV QTY ITM :{Fore.light_red}{crv_qty_items}{Fore.light_yellow})"
 
 
 def check_back_ups():
@@ -4884,34 +4896,7 @@ where:
         self.parent=parent
         self.special=['Tags','ALT_Barcode','DUP_Barcode','CaseID_6W','CaseID_BR','CaseID_LD','Facings']
         self.locationFields=LOCATION_FIELDS
-        self.valid_fields=['Shelf',
-        'BackRoom',
-        'Display_1',
-        'Display_2',
-        'Display_3',
-        'Display_4',
-        'Display_5',
-        'Display_6',
-        'ALT_Barcode',
-        'DUP_Barcode',
-        'CaseID_BR',
-        'CaseID_LD',
-        'CaseID_6W',
-        'Tags',
-        'Facings',
-        'SBX_WTR_DSPLY',
-        'SBX_CHP_DSPLY',
-        'SBX_WTR_KLR',
-        'FLRL_CHP_DSPLY',
-        'FLRL_WTR_DSPLY',
-        'WD_DSPLY',
-        'CHKSTND_SPLY',
-        'Distress',
-        'Facings',
-        'UnitsDeep',
-        'UnitsHigh',
-        'ListQty'
-        ]
+        self.valid_fields=BooleanAnswers.valid_fields
         '''
         ALT_Barcode=Column(String)
         DUP_Barcode=Column(String)

radboy-0.0.577/radboy/__init__.py

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

{radboy-0.0.575 → radboy-0.0.577}/radboy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.575
+Version: 0.0.577
 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.575 → radboy-0.0.577}/setup.py

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

radboy-0.0.575/radboy/__init__.py

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