q2rad 0.1.198__tar.gz → 0.1.200__tar.gz

{q2rad-0.1.198 → q2rad-0.1.200}/PKG-INFO

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

{q2rad-0.1.198 → q2rad-0.1.200}/pyproject.toml

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

{q2rad-0.1.198 → q2rad-0.1.200}/q2rad/q2lines.py

@@ -43,7 +43,7 @@ SQL_DATATYPES = (
     "time",
     "datetime",
 )
-HAS_DATADEC = ("dec", "numeric", "num")
+HAS_DATADEC = ("dec", "numeric", "num", "decimal")
 HAS_DATALEN = ("char", "varchar") + HAS_DATADEC
 WIDGETS = (
     "line",
@@ -72,7 +72,7 @@ WIDGETS = (
 # "toolbar;"
 # "toolbutton;"
 
-HAS_PIC = "radio;" "combo;" "list;"
+HAS_PIC = "radio;" "combo;" "list;" "line;"
 
 
 class Q2Lines(Q2Form, Q2_save_and_run):

{q2rad-0.1.198 → q2rad-0.1.200}/q2rad/q2rad.py

@@ -94,6 +94,7 @@ _logger = logging.getLogger(__name__)
 class ReturnEvent(Exception):
     pass
 
+
 def get_report(report_name="", style={}):
     if report_name == "":
         return Q2RadReport(style=style)
@@ -1017,6 +1018,7 @@ class Q2RadApp(Q2App):
                 , gridlabel
                 , tag
                 , mess
+                , alignment
                 , nogrid
                 , noform
                 , `check`

{q2rad-0.1.198 → q2rad-0.1.200}/q2rad/q2reports.py

@@ -91,6 +91,7 @@ class Q2RadReport(Q2Report):
                 form.heap.mode = mode
                 form.close()
 
+            form.add_control("/s")
             form.add_control("/h")
             form.add_control("/s")
             form.add_control("/v")
@@ -121,6 +122,24 @@ class Q2RadReport(Q2Report):
             form.add_control("/")
             form.add_control("/s")
             form.add_control("/")
+
+            def repo_edit():
+                report_edit_form = Q2ReportEdit()
+                report_edit_form.after_form_show = lambda: report_edit_form.set_content(self.report_content)
+                report_edit_form.data.update(self.data)
+                report_edit_form.data_sets.update(self.data_sets)
+                report_edit_form.run()
+                form.close()
+
+            if q2app.q2_app.dev_mode:
+                form.add_control("/s")
+                form.add_control("/h")
+                form.add_control("/s")
+                form.add_control("edit", "Edit", control="button", datalen=8, valid=repo_edit)
+                form.add_control("/s")
+                form.add_control("/")
+                form.add_control("/s")
+
             form.cancel_button = 1
             form.do_not_save_geometry = 1
             form.run()
@@ -325,6 +344,8 @@ class ReportForm:
 class Q2ReportEdit(Q2Form):
     def __init__(self):
         super().__init__("Report Edit")
+        self.data = {}
+        self.data_sets = {}
 
     def on_init(self):
         self.query_edit = Q2QueryEdit()
@@ -594,6 +615,8 @@ class Q2ReportReport(Q2Form):
 
     def run_report(self, output_file="html"):
         rep = Q2RadReport(self.report_edit_form.get_content())
+        rep.data.update(self.report_edit_form.data)
+        rep.data_sets.update(self.report_edit_form.data_sets)
         rep.run(output_file)
 
     def set_default_report_content(self):
@@ -663,7 +686,8 @@ class Q2ReportReport(Q2Form):
         prop_key = prop_name.replace("_", "-")
 
         if not self.w.__getattr__(prop_name).check.is_checked():
-            del self.current_propertys[prop_key]
+            if prop_key in self.current_propertys:
+                del self.current_propertys[prop_key]
         else:
             self.current_propertys[prop_key] = prop_value
         self.style_changed()
@@ -1985,6 +2009,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"
+                )
                 rowspan = cell_data.get("rowspan", 1)
                 colspan = cell_data.get("colspan", 1)
                 if rowspan > 1 or colspan > 1:

{q2rad-0.1.198 → q2rad-0.1.200}/q2rad/q2utils.py

@@ -131,7 +131,9 @@ class Q2Form(_Q2Form):
 
         report = get_report(style=get_report().make_style(font_size=q2app.q2_app.q2style.font_size))
 
-        report.data_sets["cursor"] = [{"_n_n_n_": x} for x in range(self.model.row_count())]
+        report.data_sets["cursor"] = [
+            {"_n_n_n_": x} for x in range(self.model.row_count()) if not self.model.is_hidden(x)
+        ]
 
         detail_rows = report.new_rows()
         detail_rows.rows["role"] = "table"

q2rad-0.1.200/q2rad/version.py

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

q2rad-0.1.198/q2rad/version.py

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