q2rad 0.1.103__py3-none-any.whl → 0.1.105__py3-none-any.whl

q2rad/q2appmanager.py

@@ -310,6 +310,7 @@ class AppManager(Q2Form):
         db: Q2Db = q2app.q2_app.db_logic
         db_tables = db.get_tables()
         wait_table = Q2WaitShow(len(data))
+        errors = []
         for table in data:
             wait_table.step(table)
             if table not in db_tables:
@@ -319,9 +320,12 @@ class AppManager(Q2Form):
             for row in data[table]:
                 wait_row.step()
                 if not db.insert(table, row):
-                    print(db.last_sql_error)
+                    errors.append(db.last_sql_error)
+                    # print(db.last_sql_error)
             wait_row.close()
         wait_table.close()
+        if errors:
+            q2Mess("<br>".join(errors))
 
     def import_data(self, file=""):
         filetype = "JSON(*.json)"
@@ -350,8 +354,8 @@ class AppManager(Q2Form):
                 wait_row.step()
                 if not db.raw_insert(table, row):
                     errors.append(db.last_sql_error)
-                    print(db.last_sql_error)
+                    # print(db.last_sql_error)
             wait_row.close()
+        wait_table.close()
         if errors:
             q2Mess("<br>".join(errors))
-        wait_table.close()

q2rad/q2appselector.py

@@ -284,6 +284,7 @@ class Q2AppSelect(Q2Form):
         }
         self._select_application(row)
         self.q2_app.migrate_db_logic()
+        self.q2_app.migrate_db_logic()
 
         demo_app_url = f"{self.q2_app.q2market_url}/demo_app.json"
         demo_data_url = f"{self.q2_app.q2market_url}/demo_data.json"
@@ -293,7 +294,7 @@ class Q2AppSelect(Q2Form):
             AppManager.import_json_app(json.load(response_app))
 
             self.q2_app.open_selected_app()
-
+            self.q2_app.migrate_db_data()
             AppManager.import_json_data(json.load(response_data))
             self.close()
         else:

q2rad/q2rad.py

@@ -42,7 +42,6 @@ import shutil
 import pkgutil
 
 
-
 # TODO: excel custom format 2 report
 
 

q2rad/q2reports.py

@@ -983,6 +983,9 @@ class Q2ReportColumns(Q2Form, ReportForm):
         self.add_control("/")
 
     def column_remove(self):
+        rows_qt = len(self.columns_data.rows)
+        if rows_qt > 1 and q2AskYN(f"This will also remove column(s) in {rows_qt} row sections ") != 2:
+            return
         selected_columns = list(set([x[1] for x in self.columns_sheet.get_selection()]))
         selected_columns.reverse()
         for current_column in selected_columns:
@@ -1212,6 +1215,7 @@ class Q2ReportRows(Q2Form, ReportForm):
         self.table_page_footer_rows = None
 
         self.spanned_cells = {}
+        self.selection_first_cell = None
 
         self.report_columns_form = report_columns_form
         self.report_report_form: Q2ReportReport = report_columns_form.report_report_form
@@ -1409,7 +1413,7 @@ class Q2ReportRows(Q2Form, ReportForm):
         selected_rows = self.get_selected_rows()
         selected_rows.reverse()
         for current_row in selected_rows:
-            current_row = self.rows_sheet.current_row()
+            # current_row = self.rows_sheet.current_row()
             self.rows_data.heights.pop(current_row)
             self.rows_sheet.remove_row(current_row)
             tmp = {}
@@ -1705,8 +1709,8 @@ class Q2ReportRows(Q2Form, ReportForm):
         # open up spanned cells
         for x in selection:
             if x in self.spanned_cells:
-                for row in range(x[0], x[0]+self.spanned_cells[x][0]):
-                    for col in range(x[1], x[1]+self.spanned_cells[x][1]):
+                for row in range(x[0], x[0] + self.spanned_cells[x][0]):
+                    for col in range(x[1], x[1] + self.spanned_cells[x][1]):
                         if (row, col) not in selection:
                             selection.append((row, col))
 
@@ -1746,18 +1750,18 @@ class Q2ReportRows(Q2Form, ReportForm):
         row = self.rows_sheet.current_row()
         column = self.rows_sheet.current_column()
         cell_key = f"{row},{column}"
-        if cell_key not in self.rows_data.cells:
-            self.rows_data.cells[cell_key] = {}
-        set_dict_default(self.rows_data.cells[cell_key], "data", "")
-        set_dict_default(self.rows_data.cells[cell_key], "style", {})
+        self.ensure_cell(cell_key)
 
-        all_style.update(self.rows_data.cells[cell_key]["style"])
+        # when selection - using style of first selected cell - fix it
+        if len(self.rows_sheet.get_selection()) == 1:
+            self.selection_first_cell = cell_key
+            all_style.update(self.rows_data.cells[cell_key]["style"])
 
-        self.report_report_form.focus_changed(self.rows_sheet)
+            self.report_report_form.focus_changed(self.rows_sheet)
 
-        self.report_report_form.update_style_bar(
-            all_style, self.rows_data.cells[cell_key]["style"], self.rows_data.cells[cell_key]
-        )
+            self.report_report_form.update_style_bar(
+                all_style, self.rows_data.cells[cell_key]["style"], self.rows_data.cells[cell_key]
+            )
 
     def rows_sheet_focus_out(self):
         pass
@@ -1868,6 +1872,16 @@ class Q2ReportRows(Q2Form, ReportForm):
                 self.add_table_footer(self.rows_data.get("table_footer"))
 
     def apply_style(self):
+        selection = self.rows_sheet.get_selection()
+        if len(selection) > 1:
+            for cell_key in selection:
+                cell_key = "{0},{1}".format(cell_key[0],cell_key[1])
+                if cell_key != self.selection_first_cell:
+                    self.ensure_cell(cell_key)
+                    self.rows_data.cells[cell_key]["style"] = dict(
+                        self.rows_data.cells[self.selection_first_cell]["style"]
+                    )
+
         self.rows_sheet.sheet_styles = self.get_style()
         self.rows_sheet.cell_styles = {}
         self.rows_sheet.clear_spans()
@@ -1884,6 +1898,12 @@ class Q2ReportRows(Q2Form, ReportForm):
                     self.rows_sheet.set_span(row, column, rowspan, colspan)
                 self.rows_sheet.set_cell_style_sheet(None, row, column)
 
+    def ensure_cell(self, cell_key):
+        if cell_key not in self.rows_data.cells:
+            self.rows_data.cells[cell_key] = {}
+        set_dict_default(self.rows_data.cells[cell_key], "data", "")
+        set_dict_default(self.rows_data.cells[cell_key], "style", {})
+
     def add_table_header(self, header_data={}):
         if self.rows_data.role != "table":
             return

q2rad/version.py

@@ -1 +1 @@
-__version__ = "0.1.103"
+__version__ = "0.1.105"

{q2rad-0.1.103.dist-info → q2rad-0.1.105.dist-info}/METADATA

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

{q2rad-0.1.103.dist-info → q2rad-0.1.105.dist-info}/RECORD

@@ -1,8 +1,8 @@
 q2rad/__init__.py,sha256=sUmWCYp2n0GJN5uzzKpn9l9ZFlArwAuHGVPMYslda_8,181
 q2rad/__main__.py,sha256=5EIdlccW2g7DO-vdSyh2K1nZ8L66wy1h9hFY0coYr-o,88
 q2rad/q2actions.py,sha256=LE-3IhmJanbsF4nXnEKyBr-TO2i-Gv7Y9aJET_mTrk0,5892
-q2rad/q2appmanager.py,sha256=-QN8y_4386hIzjSoUDh6ttLeM0x2CvKM6QQQ-3G62NY,12671
-q2rad/q2appselector.py,sha256=OMy9kI5G2KETwpGjJJkT4sOxhc1b5Sus6bSnPD49HX0,11186
+q2rad/q2appmanager.py,sha256=2eiIxVp7GCMPrc3OsRi0L5gGjRyyTDPLboaetyYrqxU,12811
+q2rad/q2appselector.py,sha256=svYrNwPBAPYJbIOO6Ri1OwiWTcbnW5equQ3EVexIwKo,11267
 q2rad/q2constants.py,sha256=uZPYPt9MCe5bX0iX-iOC350ZtTRcujI49Kags1zriAg,2896
 q2rad/q2forms.py,sha256=7jhBOkSsPFLUf6S7Jv-D6Lrty7WHCeWHQb5tMmSozVs,8474
 q2rad/q2lines.py,sha256=YH0wlj0Ml3-LdPDezbSugWY7a2ZmEfqdHF8I7Gt_0YQ,10415
@@ -10,12 +10,12 @@ q2rad/q2market.py,sha256=LgMaqa2ltb3ff1M6MQV69MLM551vPUaXIiIlQkBYkyY,2133
 q2rad/q2modules.py,sha256=ngQcf2CUcgGSuRcb3_9tKSq3O7QjDvnoJnAqhkfvc7c,2844
 q2rad/q2packages.py,sha256=4IgDx8tgz_Hbtz8WIP_yxFxhSmDAP8CeptcKosc-1ic,2825
 q2rad/q2queries.py,sha256=ZHVqXNEXiQyobJLbmrqSW4_zDGGhmJU_PO-Dyty9Gww,11231
-q2rad/q2rad.py,sha256=zvAVJw7OrNzVPHWacDGiSd_Xh2hpXSW1-3_RueXXsl0,28107
+q2rad/q2rad.py,sha256=-SvWK3JRb9F_ngLRziKWZUt3Hgs2KmfNGC-hXN86XbU,28105
 q2rad/q2raddb.py,sha256=StXGNY46t9xoOU7u5f560TiTFIzJO9sOb0zfnVS9KyA,3590
-q2rad/q2reports.py,sha256=s-a5R3Z0XAFid1xcCI42anPsiLCsjdWdhELtaT1aTNA,77719
+q2rad/q2reports.py,sha256=K-kAbHCo_21iJo-A2y6VJ7n7uUTsz4BJPg7ahBwQqfk,78690
 q2rad/q2utils.py,sha256=WWyjBhuSDDLgRalzoV4C-HeA7jl9UPJFrDpSgL29nCg,2979
-q2rad/version.py,sha256=1CibFLAOiIt8DtfD8J2EW-RKrRnhqo9gHDd3KdLEhfM,23
-q2rad-0.1.103.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.103.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
-q2rad-0.1.103.dist-info/METADATA,sha256=OgkDgtomnXDAOivQDPU2mUjUDDBmX8xwWOCrgBbzIQ8,2697
-q2rad-0.1.103.dist-info/RECORD,,
+q2rad/version.py,sha256=ppTftgcwUDE11ucuRwa71-fgfQHzPtNmPLGiBtkNs-U,23
+q2rad-0.1.105.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.105.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
+q2rad-0.1.105.dist-info/METADATA,sha256=Q_ozH57-FeeWmCsm4U1CWd7rrhWBJEeS9boEFauFocw,2697
+q2rad-0.1.105.dist-info/RECORD,,