q2rad 0.1.223__py3-none-any.whl → 0.1.225__py3-none-any.whl

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:
@@ -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:
@@ -1412,13 +1418,17 @@ class Q2RadApp(Q2App):
                 if re.findall(r"^\s*import\W*.*", x):
                     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}', 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)
         try:
             code = compile(script, f"<{script}>", "exec")
-            return {"code": code, "error": ""}
+            return {"code": code, "error": "", "script": script}
         except Exception:
             error = sys.exc_info()[1]
             msg = []

q2rad/q2raddb.py

@@ -21,7 +21,10 @@ 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 +36,6 @@ if "darwin" in sys.platform:
     import ssl
 
     ssl._create_default_https_context = ssl._create_unverified_context
-import datetime
 
 # import errno
 
@@ -173,3 +175,23 @@ 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")

q2rad/q2reports.py

@@ -26,13 +26,18 @@ from q2rad.q2queries import Q2QueryEdit
 from q2rad.q2utils import q2cursor, Q2_save_and_run
 from q2gui import q2app
 from q2gui.q2dialogs import Q2WaitShow, q2WaitMax, q2WaitStep, q2working
+from q2rad.q2raddb import *
+from q2rad.q2utils import *
 import json
 import os
+import logging
+import threading
 import gettext
 
 from q2rad.q2utils import Q2Form
 
 _ = gettext.gettext
+_logger = logging.getLogger(__name__)
 
 # TODO: selected rows removing - bug
 
@@ -190,6 +195,10 @@ class Q2RadReport(Q2Report):
         q2app.q2_app.process_events()
 
     def run(self, output_file="temp/repo.html"):
+        from q2rad.q2rad import run_module, run_form, get_form , get_report
+        _globals = {}
+        _globals.update(locals())
+
         output_file = self.prepare_output_file(output_file)
         if not output_file:
             return
@@ -214,6 +223,27 @@ class Q2RadReport(Q2Report):
 
             return real_worker
 
+        if _module := self.report_content.get("module"):
+            code = q2app.q2_app.code_compiler(_module)
+            if code["code"]:
+                _globals.update(globals())
+                try:
+                    exec(code["code"], _globals)
+                    for key, value in _globals.items():
+                        self.set_data(value, key)
+                except Exception as error:
+                    from q2rad.q2rad import explain_error
+                    _logger.error(f"{error}")
+                    explain_error()
+            else:
+                msg = code["error"]
+                if threading.current_thread() is threading.main_thread():
+                    q2mess(f"{msg}".replace("\n", "<br>").replace(" ", "&nbsp;"))
+                print(f"{msg}")
+                print("-" * 25)
+                _logger.error(msg)
+                return
+
         q2working(worker(), "W o r k i n g")
 
         super().run(output_file, data=data)
@@ -364,8 +394,8 @@ class Q2ReportEdit(Q2Form):
         self.add_control("rl", "", widget=self.layout_edit, nogrid=1, migrate=0)
         self.add_control("/t", "Query")
         self.add_control("ql", "", widget=self.query_edit, nogrid=1, migrate=0)
-        self.add_control("/t", "Setup")
-        self.add_control("before_script", "", control="code")
+        # self.add_control("/t", "Setup")
+        # self.add_control("before_script", "", control="code")
         self.add_control("/t", "Module")
         self.add_control("module", "", control="code")
         self.add_control("/t", "Comment")
@@ -380,10 +410,12 @@ class Q2ReportEdit(Q2Form):
             content_json = content
         self.query_edit.set_content(content_json)
         self.layout_edit.set_content(content_json)
+        self.s.module = content_json.get("module", "#")
 
     def get_content(self, str_mode=True):
         content = self.query_edit.get_content(str_mode=False)
         content.update(self.layout_edit.get_content(str_mode=False))
+        content["module"] = self.s.module
         if str_mode:
             return json.dumps(content, indent=2)
         else:

q2rad/q2utils.py

@@ -204,6 +204,7 @@ class Q2Form(_Q2Form):
                 q2app.q2app.ACTION_TOOLS_TEXT + "|" + "Changelog",
                 self.changelog,
                 icon="🕟",
+                eof_disabled=1,
             )
 
     def changelog(self):

q2rad/version.py

@@ -1 +1 @@
-__version__ = "0.1.223"
+__version__ = "0.1.225"

{q2rad-0.1.223.dist-info → q2rad-0.1.225.dist-info}/METADATA

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

{q2rad-0.1.223.dist-info → q2rad-0.1.225.dist-info}/RECORD

@@ -12,14 +12,14 @@ q2rad/q2market.py,sha256=RNXTNv-fFUgbzBGhHPNXlzGjsAHAtz71BRbTErJarNo,2641
 q2rad/q2modules.py,sha256=RwemVJwfxth0lBN4K96tKz62VOW71C7CmmKyhIoH5mc,4632
 q2rad/q2packages.py,sha256=y72L1RAw1OgtKGaL8lJ1KHIaers5I6kTZSiphwwrY0M,3808
 q2rad/q2queries.py,sha256=YYJEpC_0rXAV8W_lx2604yqnkooHzheFmDCfqbW02zY,13203
-q2rad/q2rad.py,sha256=ObbJUrt_-3Tqu5hrMxY7GXlvkM7FBX8g6TlKBs7IGTo,55887
-q2rad/q2raddb.py,sha256=tMX971d_awTwiWeYLkZGSfdrIs88oiNHBAs2cMFvSbU,4685
-q2rad/q2reports.py,sha256=np_Yfjy7oiQCK9MrFDlD9ojx1dIt6Yg3QqHkJbnjT6w,84886
+q2rad/q2rad.py,sha256=a9xM_aFwx1HVm2dxkZzZYuFyNYjDN86pjH_BlkI2h10,56438
+q2rad/q2raddb.py,sha256=3Tt2HomjR3RuL-lLvXr5MKxOnvQDI7HzjaLg-Ui8Y10,5342
+q2rad/q2reports.py,sha256=tAOm54_P_NN8nRDsZy8N6vbw0YOTNQ_9xtvT6NMG724,86155
 q2rad/q2stylesettings.py,sha256=rEJLyLzsffJEXnMbg9bPB3KHLjYfw-49QgrtcYOfGV0,4769
-q2rad/q2utils.py,sha256=Vb5K8Lbb7PzQGDiBEHFrPyDcytVnUSVXy9yIkvWM1Oc,19734
-q2rad/version.py,sha256=1XpZ9ZHWiFjHHBz1xBKwDLpuS3A_Vb_IEKixlVSqME4,23
-q2rad-0.1.223.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.223.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.223.dist-info/METADATA,sha256=hEnJx6Vf38LEGE1ghZ30FAgSLn7xu29pwoFQTaykDbs,3369
-q2rad-0.1.223.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.223.dist-info/RECORD,,
+q2rad/q2utils.py,sha256=APe6BIdjDY5B6V_iuy-2oRyh3UPAzc8kJmPZJY5AojA,19767
+q2rad/version.py,sha256=9mU63Yb8C2TsT1KTi0Kc4trGxd9uSqaVsWJ8b-YbpRs,23
+q2rad-0.1.225.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.225.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
+q2rad-0.1.225.dist-info/METADATA,sha256=0JHs4gVMSV_O_3YVFLGUy0QhCcBCsSlRcYYdsLwbTB4,3369
+q2rad-0.1.225.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+q2rad-0.1.225.dist-info/RECORD,,