q2rad 0.1.198__py3-none-any.whl → 0.1.200__py3-none-any.whl

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/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/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/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/version.py

@@ -1 +1 @@
-__version__ = "0.1.198"
+__version__ = "0.1.200"

{q2rad-0.1.198.dist-info → q2rad-0.1.200.dist-info}/METADATA

@@ -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.dist-info → q2rad-0.1.200.dist-info}/RECORD

@@ -5,20 +5,20 @@ q2rad/q2appmanager.py,sha256=uDm2sP49fS4sWn75NEEic0xxtFG0I780pLcxDBR4eME,15566
 q2rad/q2appselector.py,sha256=3VlYG2kn0cOVOuRfA3dWIStvtnyKZWmfbP9Jpb8w9VI,12595
 q2rad/q2constants.py,sha256=dQtN4OMvZw0FATDAFYjolI7eGMVUnNnbTl6qM-ggZ4I,3416
 q2rad/q2forms.py,sha256=A5VeBK8OdE3zn0L1TgvCk4OjpB1nLibJqBFfpVZr_Uc,10181
-q2rad/q2lines.py,sha256=9GeOQ3sLjGb7-zxMa7FkElSU_ZXP2Kgsh-rscISmhIY,16190
+q2rad/q2lines.py,sha256=oN_nLtM602WtwiS_5QRB_QI4SA7KaPwg9ypThGMhY18,16209
 q2rad/q2make.py,sha256=wXoyBUwf2zaAl9JjWDCbjAteUElRq0O7ippyaMY9eug,6476
 q2rad/q2market.py,sha256=nyIBhZYqxNSlBXpcxdBRQ1vGSzWV8jI4cQoVa9JdRhE,2589
 q2rad/q2modules.py,sha256=N3OkUKfiwVZtmDyAtnJcs2Rprd7uIHd0HhjHTyFoN_s,4294
 q2rad/q2packages.py,sha256=ifRu8LuVrrTphiJe1JUVED_KB2sHJCPVnZq9VEh3K8w,3473
 q2rad/q2queries.py,sha256=ABbr66YRLmleo2wcpvwcQwSPt_htjQsYXgoCqRRQSbo,12512
-q2rad/q2rad.py,sha256=w5ZKhxRRkw1CNKf4OW00BbNab4098EBS1y9aHjxaLZA,45743
+q2rad/q2rad.py,sha256=C1uQCCcADqjOjro0njeJQDpYFE77Qs8uh-zrD8KlNx4,45774
 q2rad/q2raddb.py,sha256=ISqT5EBFO7eaXcQRNpA0hMiRU84kbd-FcfckwKMlGfs,4506
-q2rad/q2reports.py,sha256=via1MQF5hfa-IGmzFwDmkEiNNHk0UhevM9yYhYs4DOs,83224
+q2rad/q2reports.py,sha256=Q-bZONOSDDQPrLziHTpW_L6FS82CkWzxITkv5EX5x98,84439
 q2rad/q2stylesettings.py,sha256=_aK-44kFfkaEGdwH7FzRs1KP7nsP08bL8t8OmdjM2eY,4767
-q2rad/q2utils.py,sha256=_UlCyxa7_zdwukIIqEn4vjlWkIQWvzo-9a-JcoSbwEg,19002
-q2rad/version.py,sha256=zjTAETFQFmjoYTsRUb23lAsKshWv9v29uWpa5tOyGIw,23
-q2rad-0.1.198.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.198.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.198.dist-info/METADATA,sha256=zzJuVPdUIYlTqAy4l7tOiZolshXC9Uk6yasmI2TXQnM,3369
-q2rad-0.1.198.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.198.dist-info/RECORD,,
+q2rad/q2utils.py,sha256=A4mLTVC6AdS4sTcHaG-kR8kjw4iZaXpeblmizdAwrkA,19057
+q2rad/version.py,sha256=YLzyssJcJQq9Z7UGnnzstJXTtYCbDATejLSXEhXUnGw,23
+q2rad-0.1.200.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.200.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
+q2rad-0.1.200.dist-info/METADATA,sha256=m_DuSIRA_FVdwwV8VmR6sdDwAijqcZwZ-OezsfSVz-I,3369
+q2rad-0.1.200.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+q2rad-0.1.200.dist-info/RECORD,,