radboy 0.0.597__tar.gz → 0.0.599__tar.gz

{radboy-0.0.597 → radboy-0.0.599}/PKG-INFO

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

@@ -2,8 +2,12 @@
 #USER INPUT# -> :"fcmd"
 #USER INPUT# -> :"ordered"
 #USER INPUT# -> :"192"
-#USER INPUT# -> :"3"
+#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.597"
+#USER INPUT# -> :"0.0.599"

{radboy-0.0.597 → radboy-0.0.599}/pyproject.toml

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

{radboy-0.0.597 → radboy-0.0.599}/radboy/DB/OrderedAndRxd.py

@@ -50,7 +50,7 @@ class OrderAndRxdUi():
                     filte.append(getattr(OrderedAndRecieved,k)==src_dict[k])
         return and_(*filte)
 
-    def OrderedAndRecieved_as(self,_exlcudes=[],as_=None):
+    def OrderedAndRecieved_as(self,_exlcudes=[],as_=None,item=None):
         excludes=['oarid',]
         for i in _exlcudes:
             if i not in excludes:
@@ -76,6 +76,16 @@ class OrderAndRxdUi():
                 } for i in OrderedAndRecieved.__table__.columns if i.name not in excludes}
                 session.delete(tmp)
                 session.commit()
+        elif as_ == 'from_item':
+            if isinstance(item,OrderedAndRecieved):              
+                fields={i.name:
+                {
+                    'default':getattr(item,i.name),
+                    'type':str(i.type).lower()
+
+                } for i in item.__table__.columns if i.name not in excludes}
+            else:
+                raise TypeError(item)
         else:
             raise Exception(f"Not a registered as_('{as_}')")
         if fields is not None:
@@ -85,6 +95,44 @@ class OrderAndRxdUi():
     def search(self,selector=False,menu=False):
         terms,z=self.OrderedAndRecieved_as(as_=None)
         terms=self.filter(terms)
+        def selectortext(results,page=False,self=self):
+            def edit(i,self=self):
+                edits=self.OrderedAndRecieved_as(as_="from_item",item=i)
+                with Session(ENGINE) as session:
+                    e=session.query(OrderedAndRecieved).filter(OrderedAndRecieved.oarid==i.oarid).first()
+                    if e is not None:
+                        for k in edits[0]:
+                            setattr(e,k,edits[0][k])
+                        session.commit()
+
+            def delete(i,self=self):
+                with Session(ENGINE) as session:
+                    session.query(OrderedAndRecieved).filter(OrderedAndRecieved.oarid==i.oarid).delete()
+                    session.commit()
+                
+            htext=[]
+            for num,i in enumerate(results):
+                print(std_colorize(i,num,ct))
+                if page:
+                    ready=False
+                    while not ready:
+                        menu=Control(func=FormBuilderMkText,ptext="edit/e or r/rm/del/delete/dlt",helpText="edit or delete",data="string")
+                        if menu is None:
+                            continue
+                        elif menu in ['d',]:
+                            print(std_colorize(i,num,ct))
+                            continue
+                        elif menu in ['edt','ed','e']:
+                            edit(i)
+                            ready=True
+                        elif menu in ['rm','r','del','delete','dlt']:
+                            delete(i)
+                            ready=True
+                        else:
+                            print(std_colorize(i,num,ct))
+                            continue
+                
+
         if terms is not None:
             with Session(ENGINE) as session:
                 query=session.query(OrderedAndRecieved).filter(*terms)
@@ -101,15 +149,11 @@ class OrderAndRxdUi():
 
                 if selector:
                     #for returning a list of OrderedAndRecieved
-                    htext=[]
-                    for num,i in enumerate(results):
-                        print(std_colorize(i,num,ct))
+                    selectortext(resuls)
                     pass
                 if menu:
                     #for paged edit/delete of OrderedAndRecieved and returns None
-                    htext=[]
-                    for num,i in enumerate(results):
-                        print(std_colorize(i,num,ct))
+                    selectortext(results,page=True)
                     pass
 
 
@@ -134,6 +178,11 @@ class OrderAndRxdUi():
             'desc':'search for OrderedAndRecieved',
             'exec':lambda self=self:self.search()
         }
+        self.cmds[uuid1()]={
+            'cmds':generate_cmds(startcmd=['sch','s','search'],endCmd=['m', 'menu','mnu']),
+            'desc':'search for OrderedAndRecieved with paged menu',
+            'exec':lambda self=self:self.search(menu=True)
+        }
         
         #add cmds above
         
@@ -152,9 +201,8 @@ class OrderAndRxdUi():
                     self.cmds[cmd]['cmds'].pop(self.cmds[cmd]['cmds'].index(i))
             htext.append(std_colorize(f"{self.cmds[cmd]['cmds']} - {self.cmds[cmd]['desc']}",xnum,ct))
         htext=''.join(htext)
-
+        print(htext)
         while True:
-            print(htext)
             doWhat=Control(func=FormBuilderMkText,ptext=f"{self.__class__.__name__}:Do What what",helpText=htext,data="string")
             if doWhat is None:
                 return

radboy-0.0.599/radboy/__init__.py

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

{radboy-0.0.597 → radboy-0.0.599}/radboy.egg-info/PKG-INFO

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

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

radboy-0.0.597/radboy/__init__.py

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