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

q2rad/q2reports.py

@@ -90,6 +90,7 @@ class Q2RadReport(Q2Report):
             def repo_valid(mode):
                 form.heap.mode = mode
                 form.close()
+
             form.add_control("/s")
             form.add_control("/h")
             form.add_control("/s")
@@ -125,6 +126,8 @@ class Q2RadReport(Q2Report):
             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()
 
@@ -341,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()
@@ -610,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):
@@ -679,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()
@@ -2001,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/version.py

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

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

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

{q2rad-0.1.199.dist-info → q2rad-0.1.200.dist-info}/RECORD

@@ -13,12 +13,12 @@ q2rad/q2packages.py,sha256=ifRu8LuVrrTphiJe1JUVED_KB2sHJCPVnZq9VEh3K8w,3473
 q2rad/q2queries.py,sha256=ABbr66YRLmleo2wcpvwcQwSPt_htjQsYXgoCqRRQSbo,12512
 q2rad/q2rad.py,sha256=C1uQCCcADqjOjro0njeJQDpYFE77Qs8uh-zrD8KlNx4,45774
 q2rad/q2raddb.py,sha256=ISqT5EBFO7eaXcQRNpA0hMiRU84kbd-FcfckwKMlGfs,4506
-q2rad/q2reports.py,sha256=oE0WKgDn9ZRyMCw19CvumUFIXoVhQ26zrRIk9Sq0xYc,83899
+q2rad/q2reports.py,sha256=Q-bZONOSDDQPrLziHTpW_L6FS82CkWzxITkv5EX5x98,84439
 q2rad/q2stylesettings.py,sha256=_aK-44kFfkaEGdwH7FzRs1KP7nsP08bL8t8OmdjM2eY,4767
 q2rad/q2utils.py,sha256=A4mLTVC6AdS4sTcHaG-kR8kjw4iZaXpeblmizdAwrkA,19057
-q2rad/version.py,sha256=8lW_ETkSFIIr4StGyMO88b_QqwGxmOcPcbo2up7-rJQ,23
-q2rad-0.1.199.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.199.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.199.dist-info/METADATA,sha256=_zo2lAZ6zd2gbbYWdAV01DJuEbwlgLIQZy7ZMyTEzHQ,3369
-q2rad-0.1.199.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.199.dist-info/RECORD,,
+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,,