q2rad 0.1.103__tar.gz → 0.1.105__tar.gz

{q2rad-0.1.103 → q2rad-0.1.105}/PKG-INFO

@@ -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 → q2rad-0.1.105}/pyproject.toml

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

{q2rad-0.1.103 → q2rad-0.1.105}/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-0.1.103 → q2rad-0.1.105}/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-0.1.103 → q2rad-0.1.105}/q2rad/q2rad.py

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

{q2rad-0.1.103 → q2rad-0.1.105}/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-0.1.105/q2rad/version.py

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

{q2rad-0.1.103 → q2rad-0.1.105}/setup.py

@@ -15,7 +15,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'q2rad',
-    'version': '0.1.103',
+    'version': '0.1.105',
     'description': 'RAD - database, GUI, reports',
     'long_description': '# The RAD (rapid application development) system. \n\n**(code less, make more)**  \n**Based on:**  \n    q2db        (https://pypi.org/project/q2db)  \n    q2gui       (https://pypi.org/project/q2gui)  \n    q2report    (https://pypi.org/project/q2report)  \n\n## [Read the docs](docs/index.md) \n## Install & run\n**Linux**\n```bash\nmkdir q2rad && \\\n    cd q2rad && \\\n    python3 -m pip install --upgrade pip && \\\n    python3 -m venv q2rad && \\\n    source q2rad/bin/activate && \\\n    python3 -m pip install --upgrade q2rad && \\\n    q2rad\n```\n**Windows**\n```bash\nmkdir q2rad && \\\n    cd q2rad && \\\n    py -m pip install --upgrade pip && \\\n    py -m venv q2rad && \\\n    call q2rad/scripts/activate && \\\n    pip install --upgrade q2rad  && \\\n    q2rad\n```\n**Mac**\n```bash\nmkdir q2rad && \\\n    cd q2rad && \\\n    python3 -m pip install --upgrade pip && \\\n    python3 -m venv q2rad && \\\n    source q2rad/bin/activate && \\\n    python3 -m pip install --upgrade q2rad && \\\n    q2rad\n```\n**Docker**\n```bash\ncurl -s https://raw.githubusercontent.com/AndreiPuchko/q2rad/main/docker-x11/dockerfile > dockerfile && \\\n    mkdir -p q2rad_storage/Desktop && \\\n    chmod -R 777 q2rad_storage && \\\n    sudo docker build -t q2rad . && \\\n    sudo docker run -it \\\n        -v /tmp/.X11-unix:/tmp/.X11-unix \\\n        -v $(pwd)/q2rad_storage:/home/q2rad \\\n        -e DISPLAY=$DISPLAY \\\n        -u q2rad q2rad python3 -m q2rad\n\n```\n## Concept:\nApplication as a database\n```python\nForms:        #  may have main menu (menubar) definitions\n              #  may be linked to database table\n    \n    Lines:    #  form fields(type of data and type of form control) and \n              #  layout definitions\n              #  when form is linked to database - database columns definitions\n    \n    Actions:  #  applies for database linked forms\n              #  may be standard CRUD-action \n              #  or \n              #  run a script (run reports, forms and etc)\n              #  or\n              #  may have linked subforms (one-to-many)\n\nModules:      #  python scripts\n\nQueries:      #  query development and debugging tool\n\nReports:      #  multiformat (HTML, DOCX, XLSX) reporting tool \n```\n',
     'author': 'Andrei Puchko',

q2rad-0.1.103/q2rad/version.py

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