q2rad 0.1.199__tar.gz → 0.1.201__tar.gz

{q2rad-0.1.199 → q2rad-0.1.201}/PKG-INFO

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

{q2rad-0.1.199 → q2rad-0.1.201}/pyproject.toml

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

{q2rad-0.1.199 → q2rad-0.1.201}/q2rad/q2appmanager.py

@@ -26,6 +26,16 @@ from datetime import datetime
 import json
 import os
 
+app_tables = [
+    "forms",
+    "lines",
+    "actions",
+    "reports",
+    "modules",
+    "queries",
+    "packages",
+]
+
 
 class AppManager(Q2Form):
     def __init__(self, title=""):
@@ -307,7 +317,7 @@ class AppManager(Q2Form):
         file = self.validate_impexp_file_name(file, filetype)
         if file:
             if app_json is None:
-                app_json = self.get_app_json()
+                app_json = q2working(self.get_app_json, "Prepare data...")
             if app_json:
                 json.dump(app_json, open(file, "w"), indent=1)
 
@@ -315,6 +325,8 @@ class AppManager(Q2Form):
         db: Q2Db = q2app.q2_app.db_logic
         rez = {}
         for x in db.get_tables():
+            if x not in app_tables:
+                continue
             if x.startswith("log_") or x == "sqlite_sequence":
                 continue
             rez[x] = []
@@ -332,18 +344,23 @@ class AppManager(Q2Form):
 
         file = self.validate_impexp_file_name(file, filetype)
         if file:
-            db: Q2Db = q2app.q2_app.db_data
-            rez = {}
-            for x in db.get_tables():
-                if x.startswith("log_") or x == "sqlite_sequence":
-                    continue
-                rez[x] = []
-                for row in db.table(x).records():
-                    rez[x].append(row)
-
+            rez = q2working(self.get_data_json, "Prepare data...")
             if rez:
                 json.dump(rez, open(file, "w"), indent=1)
 
+    def get_data_json(self):
+        db: Q2Db = q2app.q2_app.db_data
+        rez = {}
+        for x in db.get_tables():
+            if x in app_tables:
+                continue
+            if x.startswith("log_") or x == "sqlite_sequence":
+                continue
+            rez[x] = []
+            for row in db.table(x).records():
+                rez[x].append(row)
+        return rez
+
     def import_q2market(self):
         self.q2_app.check_app_update(force_update=True)
 
@@ -373,9 +390,9 @@ class AppManager(Q2Form):
                 continue
             wait_row = Q2WaitShow(len(data[table]))
             if table != "packages":
-                db.cursor(f'delete from `{table}` where name not like "\_%"')
+                db.cursor(f'delete from `{table}` where name not like "\\_%"')
             if db.last_sql_error:
-                print(db.last_sql_error)
+                errors.append(db.last_sql_error)
             for row in data[table]:
                 wait_row.step()
                 if table == "packages":
@@ -384,6 +401,8 @@ class AppManager(Q2Form):
                         == row["package_name"]
                     ):
                         continue
+                if row.get("name", "").startswith("_"):
+                    continue
                 if not db.insert(table, row):
                     errors.append(db.last_sql_error)
                     errors.append(db.last_record)

{q2rad-0.1.199 → q2rad-0.1.201}/q2rad/q2lines.py

@@ -15,7 +15,7 @@
 
 from q2gui.q2model import Q2CursorModel
 from q2rad.q2raddb import Q2Cursor, insert
-from q2gui.q2dialogs import q2AskYN
+from q2gui.q2dialogs import q2AskYN, q2mess
 from q2rad.q2utils import q2cursor, choice_table, choice_column, choice_form, Q2_save_and_run
 from q2rad.q2raddb import last_error
 
@@ -99,6 +99,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
         self.add_action("Layout|Form", icon="☆", worker=lambda: self.add_layout("/f"))
         self.add_action("Layout|Horizontally", worker=lambda: self.add_layout("/h"))
         self.add_action("Layout|Vertically", worker=lambda: self.add_layout("/v"))
+        self.add_action("Alter column", icon="🔧", worker=self.alter_column)
 
     def create_form(self):
         self.add_control("id", "", datatype="int", pk="*", ai="*", noform=1, nogrid=1)
@@ -130,7 +131,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                 self.add_control("/")
             if self.add_control("/h"):
                 self.add_control("stretch", _("Stretch factor"), datatype="int")
-                self.add_control("alignment", _("Alignment"), datatype="int",datalen=3)
+                self.add_control("alignment", _("Alignment"), datatype="int", datalen=3)
                 self.add_control("tag", _("Tag"), datatype="char", datalen=100)
                 self.add_control("/")
             if self.add_control("/h", _("Control type")):
@@ -277,6 +278,13 @@ class Q2Lines(Q2Form, Q2_save_and_run):
             self.controls.delete("save_and_run_actions_visible")
         self.system_controls.insert(2, self._save_and_run_control)
 
+    def alter_column(self):
+        if self.r.migrate and q2AskYN(f"Alter column {self.r.column}?") == 2:
+            record = self.get_current_record()
+            record["table"] = self.db.get("forms", f"name = '{self.prev_form.r.name}'", "form_table")
+            if not q2app.q2_app.db_data.alter_column(record):
+                q2mess(self.db_data.migrate_error_list)
+
     def copy_to(self):
         rows = self.get_grid_selected_rows()
         choice = choice_form()
@@ -374,20 +382,21 @@ class Q2Lines(Q2Form, Q2_save_and_run):
 
         cols = self.q2_app.db_data.db_schema.get_schema_columns(self.prev_form.r.form_table)
         for x in cols:
-            insert(
-                "lines",
-                {
-                    "name": self.prev_form.r.name,
-                    "column": x,
-                    "label": x,
-                    "datatype": cols[x]["datatype"],
-                    "datalen": cols[x]["datalen"],
-                    "pk": cols[x]["pk"],
-                    "ai": cols[x]["ai"],
-                    "migrate": "*",
-                },
-                self.db,
-            )
+            if self.db.get("lines", f"name = '{self.prev_form.r.name}' and column = '{x}'") == {}:
+                insert(
+                    "lines",
+                    {
+                        "name": self.prev_form.r.name,
+                        "column": x,
+                        "label": x,
+                        "datatype": cols[x]["datatype"],
+                        "datalen": cols[x]["datalen"],
+                        "pk": cols[x]["pk"],
+                        "ai": cols[x]["ai"],
+                        "migrate": "*",
+                    },
+                    self.db,
+                )
         self.refresh()
 
     def before_crud_save(self):

{q2rad-0.1.199 → q2rad-0.1.201}/q2rad/q2rad.py

@@ -421,7 +421,6 @@ class Q2RadApp(Q2App):
     def _open_database(self, database_name, db_engine_name, host, port, password, user, guest_mode=None):
         db = None
         first_pass = 0
-
         while True:
             try:
                 db = q2working(
@@ -465,7 +464,8 @@ class Q2RadApp(Q2App):
                         ),
                         mess=_("Creating database"),
                     )
-                except Exception:
+                except Exception as error:
+                    q2mess(f"Error occured while creating the database:<br>{error}")
                     return None
 
     def open_databases(self):
@@ -491,7 +491,7 @@ class Q2RadApp(Q2App):
         self.last_root_password = ""
         if self.db_data is None or self.db_logic is None:
             self.selected_application = {}
-            q2Mess(_("Can not open database"))
+            # q2Mess(_("Can not open database"))
             self.open_application()
 
     def create_menu(self):
@@ -799,7 +799,7 @@ class Q2RadApp(Q2App):
                 f" {_source_suffix}{package}{_source_postfix}"
             )
             if trm.exit_code != 0:
-                q2mess(f"Error occured while updateing <b>{package}</b>! See output for details.")
+                q2mess(f"Error occured while updating <b>{package}</b>! See output for details.")
         w.close()
         q2Mess("Finished!<p>The program will be restarted!")
         self.restart()

{q2rad-0.1.199 → q2rad-0.1.201}/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-0.1.199 → q2rad-0.1.201}/q2rad/q2utils.py

@@ -226,7 +226,8 @@ class Q2Form(_Q2Form):
                 f"""select *
                         from log_{self.model.get_table_name()}
                         {where}
-                    """
+                    """,
+                self.db,
             )
         form = Q2Form(f"Changelog ({self.title})")
         form.add_control("/")
@@ -282,10 +283,10 @@ class Q2Form(_Q2Form):
 
 
 class q2cursor(Q2Cursor):
-    def __init__(self, sql="", q2_db=None):
+    def __init__(self, sql="", q2_db=None, data=[]):
         if q2_db is None:
             q2_db = q2app.q2_app.db_data
-        super().__init__(q2_db, sql)
+        super().__init__(q2_db, sql, data=data)
         if q2_db.last_sql_error:
             print(q2_db.last_sql_error)
 

q2rad-0.1.201/q2rad/version.py

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

q2rad-0.1.199/q2rad/version.py

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