q2rad 0.1.224__tar.gz → 0.1.226__tar.gz

{q2rad-0.1.224 → q2rad-0.1.226}/PKG-INFO

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

{q2rad-0.1.224 → q2rad-0.1.226}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "q2rad"
-version = "0.1.224"
+version = "0.1.226"
 description = "RAD - database, GUI, reports"
 authors = ["Andrei Puchko <andrei.puchko@gmx.de>"]
 readme = "README.md"

{q2rad-0.1.224 → q2rad-0.1.226}/q2rad/q2forms.py

@@ -153,6 +153,13 @@ class Q2Forms(Q2Form, Q2_save_and_run):
         self.add_control("/f")
         self.add_control("comment", gridlabel=_("Comments"), datatype="longtext")
 
+        if self.add_control("/t", _("After load")):
+            self.add_control(
+                "after_form_load",
+                label=_("After Form load"),
+                nogrid="*",
+                control="code",
+            )
         if self.add_control("/t", _("Build")):
             self.add_control("/vs", tag="build")
             self.add_control("/v")

{q2rad-0.1.224 → q2rad-0.1.226}/q2rad/q2rad.py

@@ -123,6 +123,8 @@ def run_module(module_name=None, _globals={}, _locals={}, script="", import_only
             ext_module_name = row["prefix"] + module_name
             if get("modules", f"name='{ext_module_name}'", "name", q2app.q2_app.db_logic) == ext_module_name:
                 ext_modules.append(ext_module_name)
+    if get("modules", f"name='_{module_name}'", "name", q2app.q2_app.db_logic) == f"_{module_name}":
+        ext_modules.append(f"_{module_name}")
     if script:
         code = q2app.q2_app.code_compiler(script)
         if code["code"] is False:
@@ -1206,7 +1208,7 @@ 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...")
+        # print(">>", len(set(self.QApplication.allWidgets())))
         form = self.get_form(name, where=where, order=order)
         form.run()
 
@@ -1316,6 +1318,10 @@ class Q2RadApp(Q2App):
                     f"""select * from (select * from actions 
                                         where name = '{ext_name}{name}' order by seq) qq"""
                 )
+        ext_actions.append(
+            f"""select * from (select * from actions 
+                                        where name = '_{name}' order by seq) qq"""
+        )
         if ext_actions:
             ext_select = " union all  " + " union all  ".join(ext_actions)
         else:
@@ -1367,6 +1373,7 @@ class Q2RadApp(Q2App):
                         eof_disabled=action["eof_disabled"],
                     )
             run_module("_e_action", _locals=locals())
+        self.code_runner(form_dic["after_form_load"], form)()
         return form
 
     def code_compiler(self, script):
@@ -1413,7 +1420,10 @@ class Q2RadApp(Q2App):
                     module = x.split("import")[1].strip()
                     if self.db_logic.get("modules", f"name='{module}'", "name"):
                         # x = x.split("import")[0] + f"run_module('{module}', import_only=True)"
-                        x = x.split("import")[0] + f"run_module('{module}', _globals=globals(), import_only=True)"
+                        x = (
+                            x.split("import")[0]
+                            + f"run_module('{module}', _globals=globals(), import_only=True)"
+                        )
 
                 new_script_lines.append(x)
             script = "\n".join(new_script_lines)

{q2rad-0.1.224 → q2rad-0.1.226}/q2rad/q2raddb.py

@@ -21,7 +21,11 @@ from q2gui.q2model import Q2CursorModel
 from q2gui.q2utils import int_, num
 from q2gui import q2app
 from q2gui.q2dialogs import q2Mess, Q2WaitShow
-import html
+
+# import html
+import datetime
+import calendar
+
 
 from q2rad import Q2Form
 from q2gui.q2form import NEW, COPY
@@ -33,7 +37,6 @@ if "darwin" in sys.platform:
     import ssl
 
     ssl._create_default_https_context = ssl._create_unverified_context
-import datetime
 
 # import errno
 
@@ -173,3 +176,44 @@ def today():
 def ensure_empty_pk(table="", row={}, q2_db=None):
     q2_db = get_default_db(q2_db)
     q2_db.ensure_empty_pk(table, row)
+
+
+def dtoc(date, format_from="%Y-%m-%d", format_to="%d.%m.%Y"):
+    return datetime.datetime.strptime(date, format_from).strftime(format_to)
+
+
+def ctod(date, format_from="%d.%m.%Y", format_to="%Y-%m-%d"):
+    return dtoc(date, format_from, format_to)
+
+
+def first_day_of_month(date):
+    _date = datetime.datetime.strptime(date, "%Y-%m-%d")
+    _date = _date.replace(day=1)
+    return _date.strftime("%Y-%m-%d")
+
+
+def last_day_of_month(date):
+    _date = datetime.datetime.strptime(date, "%Y-%m-%d")
+    _date = _date.replace(day=calendar.monthrange(_date.year, _date.month)[1])
+    return _date.strftime("%Y-%m-%d")
+
+
+def ffinder(module_name="module", function_name="fname"):
+    from q2rad.q2rad import run_module
+    run_module(module_name, import_only=True)
+    try:
+        is_callable = eval(f"callable({function_name})")
+    except Exception:
+        is_callable = False
+
+    if not is_callable:
+
+        def empty_function(*args, **kwargs):
+            pass
+
+        return empty_function
+    else:
+        try:
+            return locals()[function_name]
+        except:
+            return globals()[function_name]

q2rad-0.1.226/q2rad/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.226"

q2rad-0.1.224/q2rad/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.224"