radboy 0.0.600__py3-none-any.whl → 0.0.602__py3-none-any.whl

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/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/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/__init__.py

@@ -1 +1 @@
-VERSION='0.0.600'
+VERSION='0.0.602'

{radboy-0.0.600.dist-info → radboy-0.0.602.dist-info}/METADATA

@@ -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.dist-info → radboy-0.0.602.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=Lt2reA6xchq3U7Y08DvkrHboZ25i1ts7X2E9gSIwcVg,41101
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=oJ3i7Z8FDBENcNq3jbdvVjVoOJ7iacCLfJ91JEopBC4,17
+radboy/__init__.py,sha256=jTalUH48QzwBdishKUPslKbh9b8CGIlQKcAA7Ucw5O8,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
@@ -83,7 +83,7 @@ radboy/DB/DatePicker.py,sha256=B75mDtXQrkHRCpoU9TJsaBVvkK37ykMaJyaiqGOo4dM,18334
 radboy/DB/DisplayItemDb.py,sha256=uVvrNyFyBuKvrw-BEPXKYvfa-QWyFN5ahESi2l6vUUA,52046
 radboy/DB/EstimatedPayCalendarWorkSheet.txt,sha256=GOjRSmGxFoNTdAnpPe2kGv7CkXDrh0Mee01HslamGbo,17173
 radboy/DB/ExerciseTracker.py,sha256=OS9i8jGIZPj-6m1bB0-eKNHQ6vf2iv_AYPEc0s4bkBM,27809
-radboy/DB/OrderedAndRxd.py,sha256=svGUo8VkavHWd9KuO8vrVVW3c7VmojTXXoJXSQVch8A,9311
+radboy/DB/OrderedAndRxd.py,sha256=lkMWGBEaij624IO3vwsIMddIJV0ZPsFsvNPxLx7whnc,9665
 radboy/DB/PayDay.py,sha256=H2kPGvBCDkMOz7lbxQhYtUt_oAInpxi37Q6MFrah98I,8710
 radboy/DB/PayModels.py,sha256=hjwWxP7PL33hmfzQl5YTf0HqzaMxXJxFknPdxFJXJc8,3499
 radboy/DB/PrintLogging.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -94,7 +94,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=YBmdo2dcovos6POsw3nNHRtt1t_y_3PwrV9Nh_j1Xy8,254771
+radboy/DB/db.py,sha256=HP49e3n54shv1_Eb5C_2X4IlIJ6_yMRaN8lvRXfzfyY,254898
 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
@@ -130,7 +130,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=7lRTDErah6dcVNn8sfdxY9ZNV66d4spF-k7m9ppSc_o,401608
+radboy/DB/__pycache__/db.cpython-313.pyc,sha256=h2IAF7BLNX4tN6VyMukAC4ECQ_-f5bZVvxL6G3DWue4,401645
 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
@@ -345,7 +345,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=i4HyPq-LNDRwYN-q_CpZDAdzipe9Dx5TWeaXRCdX79k,19818
-radboy/TasksMode/Tasks.py,sha256=-USpZTqUdaD-KxbFf8tbypGcOiQqwROhxA4xGnt6yv8,342231
+radboy/TasksMode/Tasks.py,sha256=ZOub6n24ueGNUGZqLwrK4z3ZfzCbBugBby1yukNFZnw,342454
 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
@@ -354,7 +354,7 @@ radboy/TasksMode/__pycache__/SetEntryNEU.cpython-312.pyc,sha256=pCdFj61aPKkHL6Sv
 radboy/TasksMode/__pycache__/SetEntryNEU.cpython-313.pyc,sha256=XFHp4zFZKm7bREkoR9QB1Z6AzuFxW0-yRkGaSSyRTb0,23533
 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=3Rl5wNvPHcahTeUjTJEokUNox3ZmzelgKNxhByuBfV4,416775
+radboy/TasksMode/__pycache__/Tasks.cpython-313.pyc,sha256=Jcm1SxpeuOb2U-2jLwt1Hq5F81xpR3rJTUy1egXAbH8,416991
 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
@@ -401,7 +401,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=G6lQR6TMKLBWrfU-1ejzvHdAfKm9F67EEZPFrG7iWfs,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=2HEbxz2ud5ZrJSQbNrkwZBolhrG8OykmIvZK6BmluLg,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
@@ -429,7 +429,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.600.dist-info/METADATA,sha256=-R-7u0Ib31yXXblQ2WUqU-JwyYVyTUcTA5Z2gs9wZQ0,1662
-radboy-0.0.600.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.600.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.600.dist-info/RECORD,,
+radboy-0.0.602.dist-info/METADATA,sha256=0pbI2ZGypLhgBl3lAFPTmmXg17EnWQD0sky8Ji3MBKo,1662
+radboy-0.0.602.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.602.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.602.dist-info/RECORD,,