q2rad 0.1.188__tar.gz → 0.1.190__tar.gz

{q2rad-0.1.188 → q2rad-0.1.190}/PKG-INFO

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

{q2rad-0.1.188 → q2rad-0.1.190}/pyproject.toml

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

{q2rad-0.1.188 → q2rad-0.1.190}/q2rad/q2appmanager.py

@@ -16,7 +16,7 @@
 from q2db.db import Q2Db
 from q2gui.q2utils import num
 from q2gui import q2app
-from q2gui.q2dialogs import q2AskYN, q2Mess, Q2WaitShow, q2ask
+from q2gui.q2dialogs import q2AskYN, q2Mess, Q2WaitShow, q2ask, q2working
 
 from q2rad import Q2Form
 from q2terminal.q2terminal import Q2Terminal
@@ -287,10 +287,14 @@ class AppManager(Q2Form):
         if app_name == "demo_app":
             self.export_data(f"{self.q2_app.q2market_path}/demo_data.json")
 
-        trm = Q2Terminal()
-        trm.run(f"cd {self.q2_app.q2market_path}")
-        trm.run("git add -A")
-        trm.run(f"""git commit -a -m"{version}"  """)
+        trm = Q2Terminal(callback=print)
+
+        def worker():
+            trm.run(f"cd {self.q2_app.q2market_path}")
+            trm.run("git add -A")
+            trm.run(f"""git commit -a -m"{version}"  """)
+
+        q2working(worker, "Commiting")
         q2Mess(trm.run("""git push"""))
         trm.close()
 
@@ -357,7 +361,7 @@ class AppManager(Q2Form):
         self.q2_app.open_selected_app()
 
     @staticmethod
-    def import_json_app(data, db = None):
+    def import_json_app(data, db=None):
         if db is None:
             db: Q2Db = q2app.q2_app.db_logic
         db_tables = db.get_tables()

{q2rad-0.1.188 → q2rad-0.1.190}/q2rad/q2lines.py

@@ -94,6 +94,10 @@ class Q2Lines(Q2Form, Q2_save_and_run):
         self.add_action("-")
         self.add_action("Select panel", icon="⭥", worker=self.select_panel, hotkey="F3")
         self.add_action("Copy to", icon="🧩", worker=self.copy_to)
+        self.add_action("Move rows down", icon="⭸", worker=self.move_rows_down)
+        self.add_action("Layout|Form", icon="☆", worker=lambda: self.add_layout("/f"))
+        self.add_action("Layout|Horizontally", worker=lambda: self.add_layout("/h"))
+        self.add_action("Layout|Vertically", worker=lambda: self.add_layout("/v"))
 
     def create_form(self):
         self.add_control("id", "", datatype="int", pk="*", ai="*", noform=1, nogrid=1)
@@ -292,6 +296,35 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                     print(last_error(q2app.q2_app.db_logic))
             self.refresh()
 
+    def add_layout(self, layout_type):
+        selected_row = sorted(self.get_grid_selected_rows())
+        if len(selected_row) == 0:
+            return
+        first = min(selected_row)
+        first_seq = self.model.get_record(first)["seq"]
+
+        last = max(selected_row) + 1
+
+        if last < self.model.row_count():
+            last_seq = int_(self.model.get_record(last)["seq"]) + 1
+            self.move_rows_down(last, False)
+        else:
+            last_seq = int_(self.model.get_record(self.model.row_count() - 1)["seq"]) + 2
+
+        self.move_rows_down(first, False)
+        self.model.insert({"column": layout_type, "seq": first_seq})
+        self.model.insert({"column": "/", "seq": last_seq})
+        self.refresh()
+
+    def move_rows_down(self, current_row=None, refresh=True):
+        if current_row in (None, False):
+            current_row = self.current_row
+        for x in range(current_row, self.model.row_count()):
+            rec = self.model.get_record(x)
+            self.model.update({"id": rec["id"], "seq": 1 + int_(rec["seq"])})
+        if refresh:
+            self.refresh()
+
     def select_panel(self):
         first_row = last_row = self.current_row
 

{q2rad-0.1.188 → q2rad-0.1.190}/q2rad/q2rad.py

@@ -74,6 +74,7 @@ import json
 import subprocess
 import shutil
 import pkgutil
+import pkg_resources
 import logging
 import traceback
 
@@ -700,7 +701,20 @@ class Q2RadApp(Q2App):
             latest_version = None
         installed_packages = [x.name for x in pkgutil.iter_modules()]
         if package in installed_packages:
-            current_version = self.code_runner(f"from {package} import __version__ as tmpv;return tmpv")()
+            try:
+                current_version = pkg_resources.get_distribution(package).version
+            except Exception as error:
+                _logger.error(f"Error checking version of {package}: {error}")
+                current_version = None
+            if current_version is None:
+                try:
+                    current_version = self.code_runner(
+                        f"from {package} import __version__ as tmpv;return tmpv"
+                    )()
+                except Exception as error:
+                    _logger.error(f"Error checking version of {package}: {error}")
+            if current_version is None:
+                q2mess(f"Error checkin curent version of {package}!")
         else:
             current_version = None
 
@@ -717,15 +731,16 @@ class Q2RadApp(Q2App):
             latest_version, current_version = self.get_package_versions(package)
             if self.db_logic is not None and package not in q2_modules:
                 pkg_ver = get("packages", f"package_name='{package}'", "package_version", q2_db=self.db_logic)
-                try:
-                    latest_version = version.parse(pkg_ver)
-                except Exception as error:
-                    q2mess(
-                        f"Error parsing version for <b>{package}</b>:"
-                        f"<br> {error}<br>"
-                        f"<b>{package}</b> packages update interrupted"
-                    )
-                    continue
+                if pkg_ver != "":
+                    try:
+                        latest_version = version.parse(pkg_ver)
+                    except Exception as error:
+                        q2mess(
+                            f"Error parsing version for <b>{package}</b>:"
+                            f"<br> {error}<br>"
+                            f"<b>{package}</b> packages update interrupted"
+                        )
+                        continue
             self.process_events()
             if force or latest_version != current_version and latest_version:
                 try:
@@ -873,20 +888,21 @@ class Q2RadApp(Q2App):
             if self.db_logic is not None and package not in q2_modules:
                 pkg_ver = get("packages", f"package_name='{package}'", "package_version", q2_db=self.db_logic)
                 pkg_ver = pkg_ver if pkg_ver else "99999"
-                try:
-                    if current_version is None:
-                        pass
-                    elif version.parse(current_version) < version.parse(pkg_ver):
-                        pass
-                    elif version.parse(latest_version) > version.parse(pkg_ver):
+                if pkg_ver != "":
+                    try:
+                        if current_version is None:
+                            pass
+                        elif version.parse(current_version) < version.parse(pkg_ver):
+                            pass
+                        elif version.parse(latest_version) > version.parse(pkg_ver):
+                            continue
+                    except Exception as error:
+                        q2mess(
+                            f"Error зparsing version for <b>{package}</b>:"
+                            f"<br> {error}<br>"
+                            f"<b>{package}</b> packages update skipped"
+                        )
                         continue
-                except Exception as error:
-                    q2mess(
-                        f"Error зparsing version for <b>{package}</b>:"
-                        f"<br> {error}<br>"
-                        f"<b>{package}</b> packages update skipped"
-                    )
-                    continue
             if latest_version != current_version and latest_version:
                 list_2_upgrade_message.append(f"<b>{package}</b>: {current_version} > {latest_version}")
                 list_2_upgrade.append(package)

{q2rad-0.1.188 → q2rad-0.1.190}/q2rad/q2reports.py

@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 
-from q2gui.q2dialogs import q2AskYN, q2mess
+from q2gui.q2dialogs import q2AskYN, q2mess  # noqa:F401
 from q2gui.q2widget import Q2Widget
 
 from q2gui.q2app import Q2Actions
@@ -359,7 +359,8 @@ class Q2ReportEdit(Q2Form):
             return content
 
     def after_form_show(self):
-        self.w.rl.meta["form_window"].set_style_sheet("* {font-size: 8pt;}")
+        # self.form_stack[-1].set_style_sheet("border-radius:0px;border: 0px")
+        pass
 
 
 class Q2ReportReport(Q2Form):
@@ -414,8 +415,15 @@ class Q2ReportReport(Q2Form):
                     dblclick=self.style_button_pressed,
                 )
 
-                self.add_control("", tag="pages", actions=actions)
-                # self.add_control("", control="label", tag="pages", actions=actions)
+                self.add_control("", control="toolbar", tag="report_action", actions=actions)
+                self.add_control(
+                    "efs",
+                    "Editors font size",
+                    datatype="int",
+                    control="spin",
+                    data=8,
+                    valid=self.editor_font_size,
+                )
                 self.add_control("/")
                 if self.add_control("/vr", tag="pages"):
                     self.add_control("anchor", "*", control="label")
@@ -423,126 +431,127 @@ class Q2ReportReport(Q2Form):
                 self.add_control("/")
         if self.add_control("/v", tag="style_panel"):
             self.add_control("/vr")
-            self.add_control("/f", "Font")
-            self.add_control(
-                "font_family",
-                "Font family",
-                control="combo",
-                pic="Arial;Times;Courier",
-                check=1,
-                valid=self.prop_font_family,
-                when=self.prop_font_family,
-            )
-            self.add_control(
-                "font_size",
-                "Font size",
-                control="spin",
-                datalen=5,
-                datatype="int",
-                check=1,
-                valid=self.prop_font_size,
-                when=self.prop_font_size,
-            )
-            self.add_control(
-                "font_weight",
-                "Font weight",
-                control="check",
-                check=1,
-                valid=self.prop_font_weight,
-                when=self.prop_font_weight,
-            )
-            self.add_control("/")
-
-            self.add_control(
-                "/h",
-                "Borders",
-                check=1,
-                tag="border_width",
-                valid=self.prop_border,
-                when=self.prop_border,
-            )
-            self.add_control(
-                "border_left",
-                "",
-                control="spin",
-                datalen=5,
-                valid=self.prop_border,
-                when=self.prop_border,
-            )
-            self.add_control("/v")
-            self.add_control(
-                "border_top",
-                "",
-                control="spin",
-                datalen=5,
-                valid=self.prop_border,
-                when=self.prop_border,
-            )
-            self.add_control(
-                "border_bottom",
-                "",
-                control="spin",
-                datalen=5,
-                valid=self.prop_border,
-                when=self.prop_border,
-            )
-            self.add_control("/")
-            self.add_control(
-                "border_right",
-                "",
-                control="spin",
-                datalen=5,
-                valid=self.prop_border,
-                when=self.prop_border,
-            )
+            if self.add_control("/f", "Font"):
+                self.add_control(
+                    "font_family",
+                    "Font family",
+                    control="combo",
+                    pic="Arial;Times;Courier",
+                    check=1,
+                    valid=self.prop_font_family,
+                    when=self.prop_font_family,
+                )
+                self.add_control(
+                    "font_size",
+                    "Font size",
+                    control="spin",
+                    datalen=5,
+                    datatype="int",
+                    check=1,
+                    valid=self.prop_font_size,
+                    when=self.prop_font_size,
+                )
+                self.add_control(
+                    "font_weight",
+                    "Font weight",
+                    control="check",
+                    check=1,
+                    valid=self.prop_font_weight,
+                    when=self.prop_font_weight,
+                )
             self.add_control("/")
+            if self.add_control("/v", "-"):
+                self.add_control(
+                    "/h",
+                    "Borders",
+                    check=1,
+                    tag="border_width",
+                    valid=self.prop_border,
+                    when=self.prop_border,
+                )
+                self.add_control(
+                    "border_left",
+                    "",
+                    control="spin",
+                    datalen=5,
+                    valid=self.prop_border,
+                    when=self.prop_border,
+                )
+                self.add_control("/v")
+                self.add_control(
+                    "border_top",
+                    "",
+                    control="spin",
+                    datalen=5,
+                    valid=self.prop_border,
+                    when=self.prop_border,
+                )
+                self.add_control(
+                    "border_bottom",
+                    "",
+                    control="spin",
+                    datalen=5,
+                    valid=self.prop_border,
+                    when=self.prop_border,
+                )
+                self.add_control("/")
+                self.add_control(
+                    "border_right",
+                    "",
+                    control="spin",
+                    datalen=5,
+                    valid=self.prop_border,
+                    when=self.prop_border,
+                )
+                self.add_control("/")
 
-            self.add_control(
-                "/h",
-                "Paddings",
-                check=1,
-                tag="padding",
-                valid=self.prop_padding,
-                when=self.prop_padding,
-            )
-            self.add_control(
-                "padding_left",
-                "",
-                control="doublespin",
-                datalen=5,
-                datadec=2,
-                valid=self.prop_padding,
-                when=self.prop_padding,
-            )
-            self.add_control("/v")
-            self.add_control(
-                "padding_top",
-                "",
-                control="doublespin",
-                datalen=5,
-                datadec=2,
-                valid=self.prop_padding,
-                when=self.prop_padding,
-            )
-            self.add_control(
-                "padding_bottom",
-                "",
-                control="doublespin",
-                datalen=5,
-                datadec=2,
-                valid=self.prop_padding,
-                when=self.prop_padding,
-            )
-            self.add_control("/")
-            self.add_control(
-                "padding_right",
-                "",
-                control="doublespin",
-                datalen=5,
-                datadec=2,
-                valid=self.prop_padding,
-                when=self.prop_padding,
-            )
+                self.add_control(
+                    "/h",
+                    "Paddings",
+                    check=1,
+                    tag="padding",
+                    valid=self.prop_padding,
+                    when=self.prop_padding,
+                )
+                self.add_control(
+                    "padding_left",
+                    "",
+                    control="doublespin",
+                    datalen=5,
+                    datadec=2,
+                    valid=self.prop_padding,
+                    when=self.prop_padding,
+                )
+                self.add_control("/v")
+                self.add_control(
+                    "padding_top",
+                    "",
+                    control="doublespin",
+                    datalen=5,
+                    datadec=2,
+                    valid=self.prop_padding,
+                    when=self.prop_padding,
+                )
+                self.add_control(
+                    "padding_bottom",
+                    "",
+                    control="doublespin",
+                    datalen=5,
+                    datadec=2,
+                    valid=self.prop_padding,
+                    when=self.prop_padding,
+                )
+                self.add_control("/")
+                self.add_control(
+                    "padding_right",
+                    "",
+                    control="doublespin",
+                    datalen=5,
+                    datadec=2,
+                    valid=self.prop_padding,
+                    when=self.prop_padding,
+                )
+                self.add_control("/")
             self.add_control("/")
             if self.add_control("/v", "-"):  # Alignments
                 self.add_control(
@@ -576,6 +585,13 @@ class Q2ReportReport(Q2Form):
 
         self.set_content()
 
+    def editor_font_size(self):
+        if int_(self.s.efs) <= 7:
+            self.s.efs = "8"
+        if int_(self.s.efs) >= 18:
+            self.s.efs = "18"
+        self.set_pages_style()
+
     def run_report(self, output_file="html"):
         rep = Q2RadReport(self.report_edit_form.get_content())
         rep.run(output_file)
@@ -664,7 +680,10 @@ class Q2ReportReport(Q2Form):
                 row_sheet.apply_style()
 
     def get_pages(self):
-        return self.anchor.get_layout_widgets()[1:]
+        if self.anchor:
+            return self.anchor.get_layout_widgets()[1:]
+        else:
+            return []
 
     def style_button_pressed(self):
         self.focus_changed(self.w.style_button)
@@ -775,7 +794,20 @@ class Q2ReportReport(Q2Form):
         self.w.font_weight.set_title("Bold")
         ReportForm.set_style_button(self, "Report")
         self.w.style_button.set_focus()
-        self.w.style_button.meta["form_window"].set_style_sheet("* {font-size: 8pt;}")
+        self.w.style_button.parentWidget().set_style_sheet("border-radius:0px;")
+        self.set_pages_style()
+
+    def set_pages_style(self):
+        self.w.pages.set_style_sheet(
+            f"border-radius:0px;border:0px;font-size:{self.s.efs}pt;font-family:Fixed; margin:0px;padding:0px"
+        )
+        self.report_report_form.ratio = int_(num(45) + (num(self.s.efs) - num(8)) * 2)
+        # print(self.report_report_form.ratio)
+        # if self.report_report_form.ratio != 1:
+        #     self.report_report_form.ratio = int(self.report_report_form.ratio / num(1.7))
+        # print(self.report_report_form.ratio)
+        for x in self.get_pages():
+            x.q2_form._repaint()
 
     def show_content(self):
         if self.widget() is None:
@@ -1133,9 +1165,9 @@ class Q2ReportColumns(Q2Form, ReportForm):
         form.cancel_button = 1
         form.run()
         if form.ok_pressed:
-            self.columns_data.widths[
-                self.columns_sheet.current_column()
-            ] = f"{form.s.w}{'%' if form.s.p == '*' else ''}"
+            self.columns_data.widths[self.columns_sheet.current_column()] = (
+                f"{form.s.w}{'%' if form.s.p == '*' else ''}"
+            )
             self._repaint()
 
     def style_button_pressed(self):
@@ -1233,7 +1265,10 @@ class Q2ReportColumns(Q2Form, ReportForm):
         self.columns_sheet.hide_column_headers()
 
         ReportForm.set_style_button(self, "Columns")
-
+        self.w.style_button.parentWidget().parentWidget().parentWidget().set_style_sheet(
+            "border: 0px;margin:0px;padding:0px"
+        )
+        self.w.style_button.parentWidget().parentWidget().parentWidget().layout().setSpacing(0)
         self.set_content()
         self._repaint()
 
@@ -1655,7 +1690,7 @@ class Q2ReportRows(Q2Form, ReportForm):
                 datatype="char",
                 data=self.rows_data.role,
                 pic=roles_list,
-                datalen=50,
+                datalen=10,
                 valid=role_valid,
             )
             form.add_control(
@@ -2035,7 +2070,7 @@ class Q2ReportRows(Q2Form, ReportForm):
         self.rows_sheet.add_style_sheet("border-style:solid; border-radius:0")
 
         ReportForm.set_style_button(self)
-
+        self.w.style_button.parentWidget().parentWidget().layout().setSpacing(0)
         self._repaint()
         self.set_content()
 
@@ -2116,6 +2151,6 @@ class Q2ReportRows(Q2Form, ReportForm):
             self.rows_data.heights, column=self.report_columns_form.get_column_count()
         )
 
-        self.w.style_button.set_row_size(self.rows_sheet.height())
+        # self.w.style_button.set_row_size(self.rows_sheet.height())
 
         self.set_rows_role_text()

{q2rad-0.1.188 → q2rad-0.1.190}/q2rad/q2utils.py

@@ -212,7 +212,7 @@ class Q2Form(_Q2Form):
         elif choice == 2:  # Row
             pk = self.model.get_meta_primary_key()
             cu = q2cursor(
-                f"""select * 
+                f"""select *
                         from log_{self.model.get_table_name()}
                         where {pk} = '{self.r.__getattr__(pk)}'
                     """
@@ -221,7 +221,7 @@ class Q2Form(_Q2Form):
             where = self.model.get_where()
             where = f" where {where}" if where != "" else ""
             cu = q2cursor(
-                f"""select * 
+                f"""select *
                         from log_{self.model.get_table_name()}
                         {where}
                     """
@@ -264,7 +264,10 @@ class Q2Form(_Q2Form):
             form.add_control("ql", "", widget=form.query_edit, nogrid=1, migrate=0)
 
             def after_form_show():
-                form.query_edit.set_content({"queries": {"query": self.model.get_table_name()}})
+                query = self.model.get_table_name()
+                if not query.strip().lower().startswith("select "):
+                    query = f"select * from {query}"
+                form.query_edit.set_content({"queries": {"query": query}})
 
             form.after_form_show = after_form_show
 

q2rad-0.1.190/q2rad/version.py

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

q2rad-0.1.188/q2rad/version.py

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