radboy 0.0.600__tar.gz → 0.0.602__tar.gz

{radboy-0.0.600 → radboy-0.0.602}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.600
+Version: 0.0.602
 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.602/STDOUT.TXT

@@ -0,0 +1,20 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"fcmd"
+#USER INPUT# -> :"fastshelf"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"03201519"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"03201519"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"14"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"#b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :""
+#USER INPUT# -> :"0.0.602"

{radboy-0.0.600 → radboy-0.0.602}/pyproject.toml

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

{radboy-0.0.600 → radboy-0.0.602}/radboy/DB/OrderedAndRxd.py

@@ -6,7 +6,7 @@ class OrderedAndRecieved(BASE,Template):
     select an order date by name and date , and at a later date 
     set the rx datetime
     '''
-    __tablename__='OrderedAnsRxd'
+    __tablename__='OrderedAndRecieved'
     Name=Column(String,default=None)
     ForWhom=Column(String,default=None)
     Description=Column(String,default=None)
@@ -28,7 +28,9 @@ except Exception as e:
     OrderedAndRecieved.metadata.create_all(ENGINE) 
  
 class OrderAndRxdUi():
-
+    def fixtable(self):
+        OrderedAndRecieved.__table__.drop(ENGINE)
+        OrderedAndRecieved.metadata.create_all(ENGINE) 
     #where cmds are stored
     cmds={}
     #registered cmds
@@ -183,6 +185,11 @@ class OrderAndRxdUi():
             'desc':'search for OrderedAndRecieved with paged menu',
             'exec':lambda self=self:self.search(menu=True)
         }
+        self.cmds[uuid1()]={
+            'cmds':generate_cmds(startcmd=['fix','fx',],endCmd=['tbl', 'table',]),
+            'desc':'drop and recreate table',
+            'exec':lambda self=self:self.fixtable()
+        }
         
         #add cmds above
         

{radboy-0.0.600 → radboy-0.0.602}/radboy/DB/db.py

@@ -946,7 +946,13 @@ class Template:
 
                 m.append(f"{fc}{i}{nsc[settting]}[{ft[i]}]{fc}={vg}{Style.bold}{nsc[settting]}'{fc}{vc}{getattr(self,i).strftime(f"{Fore.deep_pink_4a}%I:%M %p(12H)/{Fore.dark_red_1}%H:%M(24H)")}{nsc[settting]}'{Style.reset}{Back.black}")
             elif isinstance(getattr(self,i),datetime):
-                m.append(f"{fc}{i}{nsc[settting]}[{ft[i]}]{fc}={vg}{Style.bold}{nsc[settting]}'{fc}{vc}{getattr(self,i).strftime(f"{Fore.deep_sky_blue_4a}%m/%d/%Y @ {Fore.deep_pink_4a}%I:%M %p(12H) / {Fore.dark_red_1}%H:%M(24H)")}{nsc[settting]}'{Style.reset}{Back.black}")
+                m.append(f"{fc}{i}{nsc[settting]}[{ft[i]}]{fc}={vg}{Style.bold}{nsc[settting]}'{fc}{vc}{getattr(self,i).strftime(f"""{Fore.deep_sky_blue_4a}%m/%d/%Y 
+ %A(%d) of %B, 
+ week[Business] %V of year %Y, 
+ week[Sunday First] %U of year %Y, 
+ week[Monday First] %W of year %Y) 
+ @[12H] {Fore.deep_pink_4a}%I:%M %p
+ @[24H] {Fore.dark_red_1}%H:%M""")}{nsc[settting]}'{Style.reset}{Back.black}")
             else:
                 m.append(f"{fc}{i}{nsc[settting]}[{ft[i]}]{fc}={vg}{Style.bold}{nsc[settting]}'{fc}{vc}{getattr(self,i)}{nsc[settting]}'{Style.reset}{Back.black}")
         m.append(f") {Fore.dark_goldenrod}{nowStr.replace("\n","")}{Style.reset}")

{radboy-0.0.600 → radboy-0.0.602}/radboy/TasksMode/Tasks.py

@@ -5816,21 +5816,24 @@ Do What? [rms,rma,edit/e,<ENTER>/next,prev]"""
                             continue
                         else:
                             return
-                caseQty=(getattr(selected,count_field)-Qty)/selected.CaseCount
-                setattr(selected,"InList",True)
-                if mode == '':
-                    setattr(selected,set_field,caseQty)
-                elif mode == '+':
-                    setattr(selected,set_field,caseQty+getattr(selected,set_field))
-                elif mode == '-':
-                    setattr(selected,set_field,getattr(selected,set_field)-caseQty)
+                if Qty is not None:
+                    caseQty=(getattr(selected,count_field)-Qty)/selected.CaseCount
+                    setattr(selected,"InList",True)
+                    if mode == '':
+                        setattr(selected,set_field,caseQty)
+                    elif mode == '+':
+                        setattr(selected,set_field,caseQty+getattr(selected,set_field))
+                    elif mode == '-':
+                        setattr(selected,set_field,getattr(selected,set_field)-caseQty)
+                    else:
+                        setattr(selected,set_field,caseQty)
+                    session.commit()
+                    session.refresh(selected)
+                    result=selected
+                    msg=f"{Fore.light_red}0{Style.reset} -> {color1}{result.Name}{Style.reset}|{color2}{result.rebar()}|{result.ALT_Barcode}{Style.reset}|{color3}{result.cfmt(result.Code)}{Style.reset}|{color4}{getattr(result,fieldname)}{Style.reset}|{color4}{getattr(result,'EntryId')}{Style.reset}"
+                    print(msg)
                 else:
-                    setattr(selected,set_field,caseQty)
-                session.commit()
-                session.refresh(selected)
-                result=selected
-                msg=f"{Fore.light_red}0{Style.reset} -> {color1}{result.Name}{Style.reset}|{color2}{result.rebar()}|{result.ALT_Barcode}{Style.reset}|{color3}{result.cfmt(result.Code)}{Style.reset}|{color4}{getattr(result,fieldname)}{Style.reset}|{color4}{getattr(result,'EntryId')}{Style.reset}"
-                print(msg)
+                    print(f"{Fore.light_steel_blue}Qty was still {Fore.orange_red_1}{Qty}{Style.reset}")
 
     def bcd_img(self):
         SUPPORTEDOUT=barcode.PROVIDED_BARCODES

radboy-0.0.602/radboy/__init__.py

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

{radboy-0.0.600 → radboy-0.0.602}/radboy.egg-info/PKG-INFO

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

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

radboy-0.0.600/STDOUT.TXT

@@ -1,14 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"fcmd"
-#USER INPUT# -> :"ordered"
-#USER INPUT# -> :"192"
-#USER INPUT# -> :"schm"
-#USER INPUT# -> :"ff"
-#USER INPUT# -> :"d"
-#USER INPUT# -> :"del"
-#USER INPUT# -> :"schm"
-#USER INPUT# -> :"ff"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.599"
-#USER INPUT# -> :"0.0.600"

radboy-0.0.600/radboy/__init__.py

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