q2rad 0.1.236__tar.gz → 0.1.238__tar.gz

{q2rad-0.1.236 → q2rad-0.1.238}/PKG-INFO

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

{q2rad-0.1.236 → q2rad-0.1.238}/pyproject.toml

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

{q2rad-0.1.236 → q2rad-0.1.238}/q2rad/q2queries.py

@@ -176,6 +176,8 @@ class Q2QueryEdit(Q2Form):
         self.actions = Q2Actions()
         self._db = None
         self.actions.add_action("Run F4", self.query_list.sql_runner, hotkey="F4")
+        self.actions.add_action("Dataset|Show as JSON", self.query_list.show_dataset_json)
+        self.actions.add_action("Dataset|Save as JSON", self.query_list.save_dataset_json)
 
         self.actions.show_main_button = 0
         self.actions.show_actions = 0
@@ -183,12 +185,30 @@ class Q2QueryEdit(Q2Form):
         self.add_control("hot_key_action", actions=self.actions, control="toolbar")
         if self.add_control("/vs", tag="qev"):
             self.add_control("ql", "", widget=self.query_list, nogrid=1, migrate=0)
-            self.add_control(
-                "run_query_button",
-                "Run (F4)",
-                valid=self.query_list.sql_runner,
-                control="button",
-            )
+            if self.add_control("/h"):
+                self.add_control("/s")
+                self.add_control(
+                    "run_query_button",
+                    "Run (F4)",
+                    valid=self.query_list.sql_runner,
+                    control="button",
+                )
+                self.add_control("/s")
+                self.add_control(
+                    "show_json",
+                    "Show as JSON",
+                    valid=self.query_list.show_dataset_json,
+                    control="button",
+                )
+                self.add_control("/s")
+                self.add_control(
+                    "save_json",
+                    "Save as JSON",
+                    valid=self.query_list.save_dataset_json,
+                    control="button",
+                )
+                self.add_control("/s")
+            self.add_control("/")
             self.add_control("pl", "", widget=self.param_list, nogrid=1, migrate=0)
             self.add_control("/")
         self.add_control("code", control="codesql", nogrid=1, valid=self.sql_changed)
@@ -275,6 +295,43 @@ class Q2QueryList(Q2Form):
                 sql = sql.replace(x, f"'{value}'")
         q2cursor(sql, q2_db=self.query_editor_form._db).browse()
 
+    def prepare_dataset_json(self):
+        dataset_json = {"params": {}}
+        for query in self.model.get_records():
+            sql = query["sql"]
+            params = re_find_param.findall(sql)
+            for x in params:
+                value = self.query_editor_form.param_list.get_param(x)
+                dataset_json["params"][x] = value
+                if x[1] == "_":
+                    sql = sql.replace(x, f"{value}")
+                else:
+                    sql = sql.replace(x, f"'{value}'")
+            cu = q2cursor(sql, q2_db=self.query_editor_form._db)
+            rez = []
+            for x in cu.records():
+                rez.append(x)
+            dataset_json[query["name"]] = rez
+        return dataset_json
+
+    def show_dataset_json(self):
+        dataset_json = self.prepare_dataset_json()
+
+        if dataset_json:
+            json_form = Q2Form()
+            json_form.add_control("json", "", control="codejson", data=json.dumps(dataset_json, indent=2))
+            json_form.ok_button = True
+            json_form.show_form("JSON datasets")
+
+    def save_dataset_json(self):
+        dataset_json = self.prepare_dataset_json()
+
+        if dataset_json:
+            json_file_name = self.q2_app.get_save_file_dialoq(filter="JSON(*.json)")[0]
+            if json_file_name:
+                json_file_name = self.validate_impexp_file_name(json_file_name, "json")
+                open(json_file_name, "w", encoding="utf8").write(json.dumps(dataset_json, indent=2))
+
     def sql_to_model(self, sql):
         self.model.update({"sql": sql}, self.current_row, refresh=False)
 

{q2rad-0.1.236 → q2rad-0.1.238}/q2rad/q2reports.py

@@ -191,11 +191,13 @@ class Q2RadReport(Q2Report):
         if self.waitbar:
             self.waitbar.close()
             self.waitbar = None
-        self.last_focus_widget.set_focus()
+        if hasattr(self.last_focus_widget, "set_focus"):
+            self.last_focus_widget.set_focus()
         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
+        from q2rad.q2rad import run_module, run_form, get_form, get_report
+
         _globals = {}
         _globals.update(locals())
 
@@ -219,7 +221,6 @@ class Q2RadReport(Q2Report):
                     self.data_cursors[x] = q2cursor(sql)
                     data[x] = self.data_cursors[x].records()
                     data[x] = [row for row in self.data_cursors[x].records()]
-                    # print(q2app.q2_app.db_data.last_sql_error)
 
             return real_worker
 
@@ -233,6 +234,7 @@ class Q2RadReport(Q2Report):
                         self.set_data(value, key)
                 except Exception as error:
                     from q2rad.q2rad import explain_error
+
                     _logger.error(f"{error}")
                     explain_error()
             else:
@@ -426,12 +428,146 @@ class Q2ReportEdit(Q2Form):
         pass
 
 
+class Q2ContentEditor(Q2Form):
+    def __init__(self, title=""):
+        super().__init__(title)
+        self.add_control("/h", tag="root")
+        if self.add_control("/h", tag="blank_panel", alignment="7"):
+            self.add_control("blank", "", control="label")
+            self.add_control("/")
+        if self.add_control("/h", tag="rows_panel", alignment="7"):
+            roles = "free;table;header;footer"
+            self.add_control("role", "Role", pic=roles, control="combo", datalen=10)
+            self.add_control("groupby", "GroupBy", datalen=10)
+            self.add_control("data_source", "Source", pic="1;2;3", control="combo", datalen=10)
+            self.add_control("print_when", "Print when")
+            self.add_control("print_after", "calc after")
+            self.add_control("print_after", "calc after")
+            self.add_control("new_page_before", "On new page", control="check")
+            self.add_control("new_page_after", "New page after", control="check")
+            self.add_control("/s")
+            self.add_control("/")
+        if self.add_control("/h", tag="width_panel", alignment="7"):
+            self.add_control(
+                "width",
+                "Width",
+                datalen=6,
+                datadec=2,
+                datatype="num",
+                control="doublespin",
+                changed=self.changed_width,
+            )
+            self.add_control("pz", "%", control="check", changed=self.changed_width)
+            self.add_control("/s")
+            self.add_control("/")
+        if self.add_control("/h", tag="height_panel", alignment="7"):
+            self.add_control("h", "Height", control="label")
+            self.add_control(
+                "h0",
+                "minimal",
+                datalen=6,
+                datadec=2,
+                datatype="num",
+                control="doublespin",
+                changed=self.changed_height,
+            )
+            self.add_control(
+                "h1",
+                "maximal",
+                datalen=6,
+                datadec=2,
+                datatype="num",
+                control="doublespin",
+                changed=self.changed_height,
+            )
+            self.add_control("/s")
+            self.add_control("/")
+        if self.add_control("/h", tag="cell_panel", alignment="7"):
+            self.add_control("data", "Cell content", stretch=10, changed=self.changed_cell)
+            self.add_control("format", "Format", stretch=1, changed=self.changed_cell)
+            self.add_control("name", "Name", stretch=1, changed=self.changed_cell)
+            self.add_control("/s")
+            self.add_control("/")
+        self.add_control("/")
+        self.width_callback = None
+        self.height_callback = None
+        self.cell_callback = None
+        self.first_run = True
+
+    def hide_all(self):
+        if self.first_run and self.w.root:
+            self.first_run = None
+            print()
+            self.w.root.setFixedHeight(self.w.root.height())
+        self.hide_rows()
+        self.hide_width()
+        self.hide_height()
+        self.hide_cell()
+
+    def hide_blank(self):
+        self.w.blan_panel.hide()
+
+    def hide_rows(self):
+        if self.w.rows_panel:
+            self.w.rows_panel.hide()
+
+    def hide_width(self):
+        if self.w.width_panel:
+            self.w.width_panel.hide()
+        self.width_callback = None
+
+    def show_width(self, width, callback):
+        self.hide_all()
+        self.width_callback = callback
+        self.w.width_panel.show()
+        self.s.width = num(width.replace("%", ""))
+        self.s.pz = "*" if "%" in width else ""
+
+    def changed_width(self):
+        if self.width_callback:
+            self.width_callback(self.s.width, self.s.pz)
+
+    def hide_height(self):
+        if self.w.height_panel:
+            self.w.height_panel.hide()
+        self.width_callback = None
+
+    def show_height(self, height, callback):
+        self.hide_all()
+        self.height_callback = callback
+        self.w.height_panel.show()
+        self.s.h0 = num(height.split("-")[0])
+        self.s.h1 = num(height.split("-")[1])
+
+    def changed_height(self, text):
+        if self.height_callback:
+            self.height_callback(self.s.h0, self.s.h1)
+
+    def hide_cell(self):
+        if self.w.cell_panel:
+            self.w.cell_panel.hide()
+        self.cell_callback = None
+
+    def show_cell(self, data, format, name, callback):
+        self.hide_all()
+        self.cell_callback = callback
+        self.w.cell_panel.show()
+        self.s.data = data
+        self.s.format = format
+        self.s.name = name
+
+    def changed_cell(self, text):
+        if self.cell_callback:
+            self.cell_callback(self.s.data, self.s.format, self.s.name)
+
+
 class Q2ReportReport(Q2Form):
     def __init__(self, report_edit_form_form):
         super().__init__("Report Layout")
         self.i_am_child = True
         self.report_edit_form = report_edit_form_form
         self.anchor = None
+        self.anchor2 = None
         self.ratio = 45
         self.report_report_form = self
         self.current_propertys = {}
@@ -459,6 +595,7 @@ class Q2ReportReport(Q2Form):
                 """
 
         self.current_focus = None
+        self.content_editor = None
 
         if 1:  # Actions
             actions = Q2Actions()
@@ -467,6 +604,9 @@ class Q2ReportReport(Q2Form):
             actions.add_action("XLSX", lambda: self.run_report("xlsx"))
             actions.show_main_button = 0
 
+        if self.add_control("/h"):
+            self.add_control("anchor2", "**", control="label", nogrid=1)
+            self.add_control("/")
         if self.add_control("/h"):
             if self.add_control("/v"):
                 self.add_control("/h")
@@ -516,11 +656,30 @@ class Q2ReportReport(Q2Form):
                 )
                 self.add_control(
                     "font_weight",
-                    "Font weight",
+                    "Weight",
                     control="check",
                     check=1,
                     valid=self.prop_font_weight,
                     when=self.prop_font_weight,
+                    changed=self.prop_font_weight,
+                )
+                self.add_control(
+                    "font_style",
+                    "Italic",
+                    control="check",
+                    check=1,
+                    valid=self.prop_font_style,
+                    when=self.prop_font_style,
+                    changed=self.prop_font_style,
+                )
+                self.add_control(
+                    "text_decoration",
+                    "Underline",
+                    control="check",
+                    check=1,
+                    valid=self.prop_text_decoration,
+                    when=self.prop_text_decoration,
+                    changed=self.prop_text_decoration,
                 )
             self.add_control("/")
             if self.add_control("/v", "-"):
@@ -636,15 +795,44 @@ class Q2ReportReport(Q2Form):
                     when=self.prop_vertical_align,
                 )
                 self.add_control("/")
-
-            if self.add_control("/f", "Cell"):
-                # self.add_control("", _("Name"))
-                # self.add_control("", _("Format"))
-                self.add_control("name", _("Name"), control="line", disabled=1)
-                self.add_control("format", _("Format"), control="line", disabled=1)
-                self.add_control("data", _("Data"), control="text", disabled=1)
+            if self.add_control("/f", "Colors"):  # Colors
+                self.add_control(
+                    "color",
+                    _("Font"),
+                    control="color",
+                    check="*",
+                    valid=self.prop_color,
+                    when=self.prop_color,
+                    changed=self.prop_color,
+                )
+                self.add_control(
+                    "background",
+                    _("Background"),
+                    control="color",
+                    check="*",
+                    valid=self.prop_background,
+                    when=self.prop_background,
+                    changed=self.prop_background,
+                )
+                self.add_control(
+                    "border_color",
+                    _("Borders"),
+                    control="color",
+                    check="*",
+                    valid=self.prop_border_color,
+                    when=self.prop_border_color,
+                    changed=self.prop_border_color,
+                )
                 self.add_control("/")
-            self.add_control("/s")
+
+            # if self.add_control("/f", "Cell"):
+            #     # self.add_control("", _("Name"))
+            #     # self.add_control("", _("Format"))
+            #     self.add_control("name", _("Name"), control="line", disabled=1)
+            #     self.add_control("format", _("Format"), control="line", disabled=1)
+            #     self.add_control("data", _("Data"), control="text", disabled=1)
+            #     self.add_control("/")
+            # self.add_control("/s")
 
         self.set_content()
 
@@ -668,12 +856,15 @@ class Q2ReportReport(Q2Form):
         set_dict_default(self.report_data.style, "font-family", "Arial")
         set_dict_default(self.report_data.style, "font-size", "8pt")
         set_dict_default(self.report_data.style, "font-weight", "normal")
+        set_dict_default(self.report_data.style, "font-style", "")
+        set_dict_default(self.report_data.style, "text-decoration", "")
 
         set_dict_default(self.report_data.style, "border-width", "0 0 0 0")
         set_dict_default(self.report_data.style, "padding", "0.05cm 0.05cm 0.05cm 0.05cm")
 
-        # set_dict_default(self.report_data.style, "background-color", "white")
-        # set_dict_default(self.report_data.style, "color", "black")
+        set_dict_default(self.report_data.style, "background", "#FFFFFF")
+        set_dict_default(self.report_data.style, "color", "#000000")
+        set_dict_default(self.report_data.style, "border-color", "#000000")
 
         set_dict_default(self.report_data.style, "text-align", "left")
         set_dict_default(self.report_data.style, "vertical-align", "top")
@@ -684,9 +875,15 @@ class Q2ReportReport(Q2Form):
     def prop_font_family(self):
         self.property_changed("font_family", f"{self.s.font_family}")
 
-    def prop_font_weight(self):
+    def prop_font_weight(self, _=""):
         self.property_changed("font_weight", f"{'bold' if self.s.font_weight else 'normal'}")
 
+    def prop_font_style(self):
+        self.property_changed("font_style", f"{'italic' if self.s.font_style else ''}")
+
+    def prop_text_decoration(self):
+        self.property_changed("text_decoration", f"{'underline' if self.s.text_decoration else ''}")
+
     def prop_border(self):
         self.property_changed(
             "border_width",
@@ -719,6 +916,15 @@ class Q2ReportReport(Q2Form):
     def prop_vertical_align(self):
         self.property_changed("vertical_align", f"{self.s.vertical_align}")
 
+    def prop_color(self):
+        self.property_changed("color", f"{self.s.color}")
+
+    def prop_background(self):
+        self.property_changed("background", f"{self.s.background}")
+
+    def prop_border_color(self):
+        self.property_changed("border_color", f"{self.s.border_color}")
+
     def property_changed(self, prop_name, prop_value):
         if self.lock_status_bar:
             return
@@ -752,8 +958,8 @@ class Q2ReportReport(Q2Form):
             return []
 
     def style_button_pressed(self):
+        self.report_report_form.content_editor.hide_all()
         self.focus_changed(self.w.style_button)
-
         self.report_report_form.update_style_bar(self.get_style(), self.report_data.style)
 
     def focus_changed(self, widget):
@@ -782,12 +988,17 @@ class Q2ReportReport(Q2Form):
         self.lock_status_bar = True
         self.current_propertys = selected_style
         for x in parent_style:
-            w = self.widgets().get(x.replace("-", "_"))
+            widget_name = x.replace("-", "_")
+            w = self.widgets().get(widget_name)
             if w:
                 w.check.set_enabled(self.current_focus.meta["form"] != self)
                 w.check.set_text("")
                 if x == "font-weight":
                     w.set_text("*" if parent_style[x] == "bold" else "")
+                elif x == "font-style":
+                    w.set_text("*" if parent_style[x] == "italic" else "")
+                elif x == "text-decoration":
+                    w.set_text("*" if parent_style[x] == "underline" else "")
                 elif x == "border-width":
                     style_value = self.make_4(parent_style[x])
                     self.s.border_top = style_value[0]
@@ -813,18 +1024,18 @@ class Q2ReportReport(Q2Form):
             w = self.widgets().get(x.replace("-", "_"))
             if w:
                 w.check.set_text(True)
-        self.show_cell_content(cell_data)
+        # self.show_cell_content(cell_data)
         self.lock_status_bar = False
 
-    def show_cell_content(self, cell_data):
-        if cell_data:
-            self.s.data = cell_data.get("data", "")
-            self.s.format = cell_data.get("format", "")
-            self.s.name = cell_data.get("name", "")
-        else:
-            self.s.data = ""
-            self.s.format = ""
-            self.s.name = ""
+    # def show_cell_content(self, cell_data):
+    #     if cell_data:
+    #         self.s.data = cell_data.get("data", "")
+    #         self.s.format = cell_data.get("format", "")
+    #         self.s.name = cell_data.get("name", "")
+    #     else:
+    #         self.s.data = ""
+    #         self.s.format = ""
+    #         self.s.name = ""
 
     def set_style_button_text(self, text):
         ReportForm.set_style_button_text(self, text)
@@ -856,7 +1067,20 @@ class Q2ReportReport(Q2Form):
             return content
 
     def after_form_show(self):
-        self.w.style_panel.set_size_policy("maximum", "preffered")
+        self.anchor2: Q2Widget = self.w.anchor2
+        if self.anchor2 is not None:
+            self.anchor2.set_visible(False)
+
+            self.content_editor = Q2ContentEditor()
+            w = self.content_editor.get_widget()
+            self.widgets()["report_report"] = w
+            self.content_editor.form_stack = [w]
+            self.anchor2.add_widget_below(w)
+            w.show()
+            self.content_editor.hide_all()
+            self.w.style_panel.set_size_policy("maximum", "preffered")
+            # self.style_button_pressed()
+
         self.w.font_weight.set_title("Bold")
         ReportForm.set_style_button(self, "Report")
         self.w.style_button.set_focus()
@@ -883,6 +1107,7 @@ class Q2ReportReport(Q2Form):
             self.anchor.set_visible(False)
             for page in self.report_data["pages"]:
                 self.anchor.add_widget_below(Q2ReportPage(self, page).get_widget(), -1)
+        self.style_button_pressed()
 
 
 class Q2ReportPage(Q2Form, ReportForm):
@@ -996,6 +1221,7 @@ class Q2ReportPage(Q2Form, ReportForm):
         self._repaint()
 
     def style_button_pressed(self):
+        self.report_report_form.content_editor.hide_all()
         self.report_report_form.focus_changed(self.w.style_button)
         self.report_report_form.update_style_bar(self.get_style(), self.page_data.style)
 
@@ -1129,7 +1355,7 @@ class Q2ReportColumns(Q2Form, ReportForm):
             "columns_sheet",
             control="sheet",
             actions=self.col_actions,
-            valid=self.column_sheet_focus_changed,
+            # valid=self.column_sheet_focus_changed,
             when=self.column_sheet_focus_changed,
             dblclick=self.cell_double_clicked,
             eat_enter=1,
@@ -1237,13 +1463,21 @@ class Q2ReportColumns(Q2Form, ReportForm):
             self._repaint()
 
     def style_button_pressed(self):
+        self.report_report_form.content_editor.hide_all()
         self.report_report_form.focus_changed(self.w.style_button)
         self.report_report_form.update_style_bar(self.get_style(), self.columns_data.style)
 
     def column_sheet_focus_changed(self):
         # self.report_report_form.focus_changed(self.columns_sheet.get_current_widget())
+        self.report_report_form.content_editor.show_width(
+            self.columns_sheet.get_text(), self.update_column_width
+        )
         self.report_report_form.focus_changed(self.columns_sheet)
 
+    def update_column_width(self, width, pz):
+        self.columns_data.widths[self.columns_sheet.current_column()] = f"{width}{'%' if pz == '*' else ''}"
+        self._repaint()
+
     def get_column_count(self):
         return len(self.columns_data.widths)
 
@@ -1449,7 +1683,7 @@ class Q2ReportRows(Q2Form, ReportForm):
             control="sheet",
             actions=self.row_actions,
             when=self.rows_sheet_focus_in,
-            valid=self.rows_sheet_focus_out,
+            # valid=self.rows_sheet_focus_out,
             dblclick=self.cell_double_clicked,
             eat_enter=1,
         )
@@ -1687,7 +1921,7 @@ class Q2ReportRows(Q2Form, ReportForm):
             cell_data["name"] = form.s.name
             self.rows_sheet.set_text(form.s.content)
             self._repaint()
-            self.report_report_form.show_cell_content(cell_data)
+            # self.report_report_form.show_cell_content(cell_data)
 
     def edit_row_height(self):
         height = self.rows_sheet.get_cell_text(
@@ -1923,6 +2157,42 @@ class Q2ReportRows(Q2Form, ReportForm):
                 all_style, self.rows_data.cells[cell_key]["style"], self.rows_data.cells[cell_key]
             )
 
+        if self.focus_widget() == self.w.style_button:
+            self.report_report_form.content_editor.hide_all()
+            # self.edit_data_role()
+        elif column == self.report_columns_form.get_column_count():
+            self.report_report_form.content_editor.show_height(
+                self.rows_sheet.get_cell_text(
+                    row=self.rows_sheet.current_row(),
+                    column=self.report_columns_form.get_column_count(),
+                ),
+                self.update_row_height,
+            )
+        else:
+            key = f"{self.rows_sheet.current_row()},{self.rows_sheet.current_column()}"
+            cell_data = self.rows_data.cells.get(key, {})
+            self.report_report_form.content_editor.show_cell(
+                self.rows_sheet.get_text(),
+                cell_data.get("format", ""),
+                cell_data.get("name", ""),
+                self.update_cell,
+            )
+
+    def update_row_height(self, h0, h1):
+        h0 = 0 if num(h0) == 0 else num(h0)
+        h1 = 0 if num(h1) == 0 else num(h1)
+        self.rows_data.heights[self.rows_sheet.current_row()] = f"{h0}-{h1}"
+        self._repaint()
+
+    def update_cell(self, data, format, name):
+        key = f"{self.rows_sheet.current_row()},{self.rows_sheet.current_column()}"
+        cell_data = self.rows_data.cells.get(key, {})
+        cell_data["data"] = data
+        cell_data["format"] = format
+        cell_data["name"] = name
+        self.rows_sheet.set_text(data)
+        self._repaint()
+
     def rows_sheet_focus_out(self):
         pass
 
@@ -2051,9 +2321,9 @@ class Q2ReportRows(Q2Form, ReportForm):
                 cell_data = self.rows_data.cells.get(f"{row},{column}", {})
 
                 self.rows_sheet.cell_styles[f"{row},{column}"] = cell_data.get("style", {})
-                self.rows_sheet.cell_styles[f"{row},{column}"]["border-color"] = (
-                    "white" if self.q2_app.q2style.color_mode == "dark" else "black"
-                )
+                # self.rows_sheet.cell_styles[f"{row},{column}"]["border-color"] = (
+                #     "white" if self.q2_app.q2style.color_mode == "dark" else "black"
+                # )
                 rowspan = cell_data.get("rowspan", 1)
                 colspan = cell_data.get("colspan", 1)
                 if rowspan > 1 or colspan > 1:

{q2rad-0.1.236 → q2rad-0.1.238}/q2rad/q2utils.py

@@ -71,6 +71,7 @@ class Q2Form(_Q2Form):
         when=None,
         show=None,
         valid=None,
+        changed=None,
         dblclick=None,
         readonly=None,
         disabled=None,
@@ -114,6 +115,7 @@ class Q2Form(_Q2Form):
             when,
             show,
             valid,
+            changed,
             dblclick,
             readonly,
             disabled,

q2rad-0.1.238/q2rad/version.py

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

q2rad-0.1.236/q2rad/version.py

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