q2rad 0.1.215__py3-none-any.whl → 0.1.217__py3-none-any.whl

q2rad/q2rad.py

@@ -111,7 +111,11 @@ def run_form(form_name, order="", where=""):
     return q2app.q2_app.run_form(form_name, order=order, where=where)
 
 
-def run_module(module_name=None, _globals={}, _locals=locals(), script="", import_only=False):
+def get_form(form_name, order="", where=""):
+    return q2app.q2_app.get_form(form_name, order=order, where=where)
+
+
+def run_module(module_name=None, _globals={}, _locals={}, script="", import_only=False):
     ext_modules = []
     if module_name is not None:
         script = q2app.q2_app.db_logic.get("modules", f"name = '{module_name}'", "script")
@@ -135,7 +139,7 @@ def run_module(module_name=None, _globals={}, _locals=locals(), script="", impor
             else:
                 __name__ = "__main__"
 
-            _locals.update(
+            _globals.update(
                 {
                     "RETURN": None,
                     "ReturnEvent": ReturnEvent,
@@ -146,10 +150,14 @@ def run_module(module_name=None, _globals={}, _locals=locals(), script="", impor
                 }
             )
             _globals.update(globals())
-            _globals.update(_locals)
             try:
-                exec(code["code"], _globals)
+                if _locals:
+                    exec(code["code"], _globals, _locals)
+                else:
+                    exec(code["code"], _globals)
             except ReturnEvent as error:
+                if _locals:
+                    _globals["RETURN"] = _locals["RETURN"]
                 pass
             except Exception as error:
                 explain_error()
@@ -161,8 +169,10 @@ def run_module(module_name=None, _globals={}, _locals=locals(), script="", impor
 
         if res is not None:
             return res
-
-    return _globals.get("RETURN")
+    res = _globals.get("RETURN")
+    if "RETURN" in _globals:
+        del _globals["RETURN"]
+    return res
 
 
 def explain_error(tb=None, errtype=None):
@@ -762,7 +772,7 @@ class Q2RadApp(Q2App):
         upgraded = []
         w = Q2WaitShow(len(packages_list))
         for package in packages_list:
-            if w.step(package):
+            if w.step(f"{package if isinstance(package, str) else package[0]}"):
                 break
             latest_version, current_version = self.get_package_versions(package)
             # q2mess([package, latest_version, current_version])
@@ -860,6 +870,9 @@ class Q2RadApp(Q2App):
         if self.frozen:
             return
 
+        if isinstance(package, tuple) or isinstance(package, list):
+            package = package[1] if package[1] else package[0]
+
         def pip_runner():
             trm = Q2Terminal(callback=print)
             trm.run(
@@ -1094,7 +1107,8 @@ class Q2RadApp(Q2App):
         make_binary(self)
 
     def run_form(self, name, order="", where=""):
-        form = q2working(lambda: self.get_form(name, where=where, order=order), "Loading form...")
+        # form = q2working(lambda: self.get_form(name, where=where, order=order), "Loading form...")
+        form = self.get_form(name, where=where, order=order)
         form.run()
 
     def get_form(
@@ -1146,7 +1160,8 @@ class Q2RadApp(Q2App):
             """
         cu: Q2Cursor = q2cursor(sql, self.db_logic)
 
-        form = Q2Form(form_dic["title"])
+        mem = form = Q2Form(form_dic["title"])
+        form._name = name
         form.no_view_action = False if form_dic["view_action"] else True
         form.ok_button = form_dic["ok_button"]
         form.cancel_button = form_dic["cancel_button"]
@@ -1178,6 +1193,7 @@ class Q2RadApp(Q2App):
                 x["show"] = self.code_runner(x["_show"], form)
             x["when"] = self.code_runner(x["_when"], form)
             form.add_control(**x)
+            run_module("_e_control", _locals=locals())
 
         # add datasource
         if form_dic["form_table"]:
@@ -1189,7 +1205,23 @@ class Q2RadApp(Q2App):
             form_model = Q2CursorModel(form_cursor)
             form.set_model(form_model)
         # add actions
-        sql = f"select * from actions where name = '{name}' order by seq"
+
+        ext_actions = []
+        for row in q2cursor("select prefix from extensions order by seq").records():
+            ext_name = row["prefix"]
+            if (
+                get("actions", f"name='{ext_name}{name}'", "name", q2app.q2_app.db_logic)
+                == f"{ext_name}{name}"
+            ):
+                ext_actions.append(
+                    f"""select * from (select * from actions 
+                                        where name = '{ext_name}{name}' order by seq) qq"""
+                )
+        if ext_actions:
+            ext_select = " union all  " + " union all  ".join(ext_actions)
+        else:
+            ext_select = ""
+        sql = f"select * from (select * from actions where name = '{name}' order by seq ) qq {ext_select}"
         cu = q2cursor(sql, self.db_logic)
         for x in cu.records():
             if x["action_mode"] == "1":
@@ -1231,7 +1263,7 @@ class Q2RadApp(Q2App):
                         child_copy_mode=x["child_copy_mode"],
                         eof_disabled=x["eof_disabled"],
                     )
-
+            run_module("_e_action", _locals=locals())
         return form
 
     def code_compiler(self, script):

q2rad/version.py

@@ -1 +1 @@
-__version__ = "0.1.215"
+__version__ = "0.1.217"

{q2rad-0.1.215.dist-info → q2rad-0.1.217.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: q2rad
-Version: 0.1.215
+Version: 0.1.217
 Summary: RAD - database, GUI, reports
 Author: Andrei Puchko
 Author-email: andrei.puchko@gmx.de

{q2rad-0.1.215.dist-info → q2rad-0.1.217.dist-info}/RECORD

@@ -12,14 +12,14 @@ q2rad/q2market.py,sha256=RNXTNv-fFUgbzBGhHPNXlzGjsAHAtz71BRbTErJarNo,2641
 q2rad/q2modules.py,sha256=FetB84IxsuDzNYKTFM3BdvfH5GrWrFKoi6cV5uW1fKo,4360
 q2rad/q2packages.py,sha256=y72L1RAw1OgtKGaL8lJ1KHIaers5I6kTZSiphwwrY0M,3808
 q2rad/q2queries.py,sha256=RaNQMZaJy97Hcj_iNzSgHkCbM2s-J-vNaW7IyBFFbCc,12602
-q2rad/q2rad.py,sha256=lchUAZ6IecsBXQNIqi2nZbfgTFxJBGsfXz7UIa9hJoc,50384
+q2rad/q2rad.py,sha256=--C8iBgUlOxDHCVjsf6E1rbDIW3oRZ_cIufksiaeV8U,51838
 q2rad/q2raddb.py,sha256=8cQcByBQoROwInPNA3bEy8INxTg6rPixbyle4QY4WU8,4555
 q2rad/q2reports.py,sha256=zVQbBoXHcdSPhoGlayzdoZ0b1qrRbafM6r1wP2VP0B4,84480
 q2rad/q2stylesettings.py,sha256=rEJLyLzsffJEXnMbg9bPB3KHLjYfw-49QgrtcYOfGV0,4769
 q2rad/q2utils.py,sha256=Vb5K8Lbb7PzQGDiBEHFrPyDcytVnUSVXy9yIkvWM1Oc,19734
-q2rad/version.py,sha256=AIQYkltrfdSbyPVoB5x6aSZG30SPkp7FaszzGk6-n_Q,23
-q2rad-0.1.215.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.215.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.215.dist-info/METADATA,sha256=P0R9l4ZmDH17btItsR9bF5MT8-p8NvEPbc93NrPuZV8,3369
-q2rad-0.1.215.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.215.dist-info/RECORD,,
+q2rad/version.py,sha256=HuDeLxbAxYJMq9H9bSODRQmDLvi7yQmRIrpEz_DvSEQ,23
+q2rad-0.1.217.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.217.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
+q2rad-0.1.217.dist-info/METADATA,sha256=kfyl8SBIH8wgiuTkEukZWBEGIhDt_PQKFir8yfOPp_U,3369
+q2rad-0.1.217.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+q2rad-0.1.217.dist-info/RECORD,,