q2rad 0.1.208__tar.gz → 0.1.209__tar.gz

{q2rad-0.1.208 → q2rad-0.1.209}/PKG-INFO

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

{q2rad-0.1.208 → q2rad-0.1.209}/pyproject.toml

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

{q2rad-0.1.208 → q2rad-0.1.209}/q2rad/q2appmanager.py

@@ -40,6 +40,7 @@ app_tables = [
 class AppManager(Q2Form):
     def __init__(self, title=""):
         super().__init__("Manage q2Application")
+        self.selected_tables = []
 
     def on_init(self):
         app_data = q2app.q2_app.selected_application
@@ -332,7 +333,68 @@ class AppManager(Q2Form):
                 rez[x].append(row)
         return rez
 
+    def tables_selector(self, mode="export"):
+        st = Q2Form(f"Select tables for {mode}")
+        st.ok_button = 1
+        st.cancel_button = 1
+
+        def get_widgets(st=st):
+            return [x for x in st.widgets() if x.startswith("c_")]
+
+        tables = [
+            x
+            for x in q2app.q2_app.db_data.get_tables()
+            if not x.startswith("log_") and x != "sqlite_sequence"
+        ]
+        if st.add_control("/v"):
+            if st.add_control("/vr"):
+                tables.sort()
+                for index, table in enumerate(tables):
+                    if self.selected_tables == []:
+                        check_data = 1
+                    else:
+                        check_data = table in self.selected_tables
+
+                    label = get("forms", f"form_table='{table}'", "title", self.q2_app.db_logic)
+                    st.add_control(
+                        f"c_{index}", pic=f"{table} ({label})", control="check", data=check_data, stretch=99
+                    )
+            st.add_control("/")
+        st.add_control("/")
+        st.add_control("/h")
+        st.add_control(
+            "all",
+            "Check all",
+            control="button",
+            datalen=10,
+            valid=lambda: [st.s.__setattr__(x, 1) for x in get_widgets()],
+        )
+        st.add_control(
+            "nothing",
+            "Uncheck all",
+            control="button",
+            datalen=10,
+            valid=lambda: [st.s.__setattr__(x, 0) for x in get_widgets()],
+        )
+        st.add_control(
+            "invert",
+            "Invert",
+            control="button",
+            datalen=10,
+            valid=lambda: [st.s.__setattr__(x, 0 if st.s.__getattr__(x) else 1) for x in get_widgets()],
+        )
+        st.add_control("/")
+        st.run()
+
+        if st.ok_pressed:
+            self.selected_tables = [
+                table for index, table in enumerate(tables) if st.s.__getattr__(f"c_{index}")
+            ]
+            return True
+
     def export_data(self, file=""):
+        if not self.tables_selector("export"):
+            return
         filetype = "JSON(*.json)"
         if not file:
             file, filetype = q2app.q2_app.get_save_file_dialoq("Export Database", filter=filetype)
@@ -349,14 +411,16 @@ class AppManager(Q2Form):
     def get_data_json(self):
         db: Q2Db = q2app.q2_app.db_data
         rez = {}
-        for x in db.get_tables():
-            if x in app_tables:
+        for table in db.get_tables():
+            if table in app_tables:
                 continue
-            if x.startswith("log_") or x == "sqlite_sequence":
+            if table.startswith("log_") or table == "sqlite_sequence":
                 continue
-            rez[x] = []
-            for row in db.table(x).records():
-                rez[x].append(row)
+            if table not in self.selected_tables:
+                continue
+            rez[table] = []
+            for row in db.table(table).records():
+                rez[table].append(row)
         return rez
 
     def import_q2market(self):
@@ -410,6 +474,8 @@ class AppManager(Q2Form):
             q2Mess("<br>".join(errors))
 
     def import_data(self, file=""):
+        if not self.tables_selector("import"):
+            return
         filetype = "JSON(*.json)"
         if not file:
             file, filetype = q2app.q2_app.get_open_file_dialoq("Import Data", filter=filetype)
@@ -418,10 +484,10 @@ class AppManager(Q2Form):
             return
 
         data = json.load(open(file))
-        self.import_json_data(data)
+        self.import_json_data(data, self.selected_tables)
 
     @staticmethod
-    def import_json_data(data):
+    def import_json_data(data, selected_tables=[]):
         db: Q2Db = q2app.q2_app.db_data
         db_tables = db.get_tables()
         wait_table = Q2WaitShow(len(data))
@@ -430,6 +496,8 @@ class AppManager(Q2Form):
             wait_table.step(table)
             if table not in db_tables:
                 continue
+            if selected_tables and table not in selected_tables:
+                continue
             wait_row = Q2WaitShow(len(data[table]))
             db.cursor(f"delete from {table}")
             for row in data[table]:

{q2rad-0.1.208 → q2rad-0.1.209}/q2rad/q2forms.py

@@ -262,7 +262,7 @@ class Q2Forms(Q2Form, Q2_save_and_run):
     def select_data_storage_table(self):
         choice = choice_table()
         if choice:
-            self.s.form_table = choice['table']
+            self.s.form_table = choice["table"]
             if self.s.name == "":
                 self.s.name = self.s.form_table
             if self.s.title == "":
@@ -272,7 +272,7 @@ class Q2Forms(Q2Form, Q2_save_and_run):
         choice = choice_column(self.s.form_table)
         if choice:
             self.s.form_table_sort += ", " if self.s.form_table_sort else ""
-            self.s.form_table_sort += choice['col']
+            self.s.form_table_sort += choice["col"]
 
     def form_runner(self):
         name = self.r.name
@@ -283,3 +283,29 @@ class Q2Forms(Q2Form, Q2_save_and_run):
             q2mess(_("Give me some NAME!!!"))
             self.w.name.set_focus()
             return False
+
+    def after_crud_save(self):
+        super().after_crud_save()
+        if self.crud_mode != "EDIT":
+            if self.s.form_table:
+                self.db.insert(
+                    "lines",
+                    {
+                        "name": self.s.name,
+                        "column": "id",
+                        "noform": "*",
+                        "nogrid": "*",
+                        "datatype": "int",
+                        "migrate": "*",
+                        "pk": "*",
+                        "ai": "*",
+                    },
+                )
+                self.db.insert(
+                    "actions",
+                    {
+                        "name": self.s.name,
+                        "action_mode": "1",
+                    },
+                )
+                self.refresh()

{q2rad-0.1.208 → q2rad-0.1.209}/q2rad/q2lines.py

@@ -22,7 +22,7 @@ from q2rad.q2raddb import last_error
 from q2rad.q2utils import Q2Form, int_
 
 from q2gui import q2app
-
+import csv
 
 import gettext
 
@@ -91,7 +91,8 @@ class Q2Lines(Q2Form, Q2_save_and_run):
         # self.add_seq_actions()
 
         self.add_action("Run", self.form_runner, hotkey="F4")
-        self.add_action("Fill", self.filler)
+        self.add_action("Fill from DB", self.filler)
+        self.add_action("Fill from CSV", self.csv_filler)
         self.add_action("-")
         self.add_action("Select panel", icon="⭥", worker=self.select_panel, hotkey="F3")
         self.add_action("Copy to", icon="❖", worker=self.copy_to)
@@ -103,6 +104,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
 
     def create_form(self):
         from q2rad.q2forms import Q2Forms
+
         self.add_control("id", "", datatype="int", pk="*", ai="*", noform=1, nogrid=1)
         self.add_control("column", _("Column name"), datalen=50)
         self.add_control("/")
@@ -303,15 +305,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
         rows = self.get_grid_selected_rows()
         choice = choice_form()
         if choice:
-            seq = (
-                int_(
-                    q2cursor(
-                        f"select max(seq) as maxseq from lines where name='{choice['name']}'",
-                        q2app.q2_app.db_logic,
-                    ).r.maxseq
-                )
-                + 1
-            )
+            seq = self.get_next_sequence(choice["name"])
             for x in rows:
                 rec = self.model.get_record(x)
                 rec["seq"] = seq
@@ -321,6 +315,18 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                     print(last_error(q2app.q2_app.db_logic))
             self.refresh()
 
+    def get_next_sequence(self, form_name):
+        seq = (
+            int_(
+                q2cursor(
+                    f"select max(seq) as maxseq from lines where name='{form_name}'",
+                    q2app.q2_app.db_logic,
+                ).r.maxseq
+            )
+            + 1
+        )
+        return seq
+
     def add_layout(self, layout_type):
         selected_row = sorted(self.get_grid_selected_rows())
         if len(selected_row) == 0:
@@ -401,6 +407,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                 return
 
         cols = self.q2_app.db_data.db_schema.get_schema_columns(self.prev_form.r.form_table)
+        seq = self.get_next_sequence(self.prev_form.r.name)
         for x in cols:
             if self.db.get("lines", f"name = '{self.prev_form.r.name}' and `column` = '{x}'") == {}:
                 insert(
@@ -414,9 +421,46 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                         "pk": cols[x]["pk"],
                         "ai": cols[x]["ai"],
                         "migrate": "*",
+                        "seq": seq,
                     },
                     self.db,
                 )
+                seq += 1
+        self.refresh()
+
+    def csv_filler(self):
+        if self.model.row_count() > 0:
+            if q2AskYN("Lines list is not empty! Are you sure") != 2:
+                return
+
+        csv_file_name = q2app.q2_app.get_open_file_dialoq("Open CSV file", filter="CSV (*.csv)")[0]
+        if not csv_file_name:
+            return
+
+        with open(csv_file_name) as csv_file:
+            reader = csv.DictReader(csv_file, dialect="excel", delimiter=";")
+            cols = {x: 0 for x in reader.fieldnames}
+            for x in reader:
+                for key, value in x.items():
+                    cols[key] = max(cols[key], len(value))
+            cols
+        seq = self.get_next_sequence(self.prev_form.r.name)
+        for x in cols:
+            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": "char",
+                        "datalen": cols[x],
+                        "migrate": "*",
+                        "seq": seq,
+                    },
+                    self.db,
+                )
+                seq += 1
         self.refresh()
 
     def before_crud_save(self):
@@ -431,7 +475,6 @@ class Q2Lines(Q2Form, Q2_save_and_run):
         self.datatype_valid()
         self.control_valid()
         self.database_valid()
-        # self.next_sequense()
 
     def datatype_valid(self):
         self.w.datalen.set_enabled(self.s.datatype in ";".join(HAS_DATALEN))

{q2rad-0.1.208 → q2rad-0.1.209}/q2rad/q2rad.py

@@ -523,11 +523,11 @@ class Q2RadApp(Q2App):
         # self.dev_mode = False
 
         if self.dev_mode:
-            self.add_menu("Dev|Forms", self.run_forms, toolbar=self.dev_mode)
-            self.add_menu("Dev|Modules", self.run_modules, toolbar=self.dev_mode)
-            self.add_menu("Dev|Querys", self.run_queries, toolbar=self.dev_mode)
-            self.add_menu("Dev|Reports", self.run_reports, toolbar=self.dev_mode)
-            self.add_menu("Dev|Packages", self.run_packages, toolbar=self.dev_mode)
+            self.add_menu("Dev|Forms", self.run_forms)
+            self.add_menu("Dev|Modules", self.run_modules)
+            self.add_menu("Dev|Querys", self.run_queries)
+            self.add_menu("Dev|Reports", self.run_reports)
+            self.add_menu("Dev|Packages", self.run_packages)
             if not self.frozen:
                 self.add_menu("Dev|-")
                 self.add_menu("Dev|Make binary", self.make_binary)
@@ -786,7 +786,6 @@ class Q2RadApp(Q2App):
             mess = ("Upgrading complete!<p>" "The program will be restarted!" "<p><p>") + "<p>".join(upgraded)
         else:
             mess = "Updates not found!<p>"
-        q2Mess(mess)
         if upgraded:
             self.restart()
 
@@ -836,12 +835,6 @@ class Q2RadApp(Q2App):
         if self.frozen:
             return
 
-        q2mess(
-            f'"{sys.executable.replace("w.exe", ".exe")}" -m pip install '
-            f"--upgrade --no-cache-dir {package if isinstance(package, str) else package[1]} "
-            f"=={latest_version}"
-        )
-
         def pip_runner():
             trm = Q2Terminal(callback=print)
             trm.run(

{q2rad-0.1.208 → q2rad-0.1.209}/q2rad/q2utils.py

@@ -357,7 +357,7 @@ def q2choice(records=[], title="Make your choice", column_title=["Column"]):
 
 def choice_table():
     return q2choice(
-        [{"table": x} for x in q2app.q2_app.db_data.db_schema.get_schema_tables()],
+        [{"table": x} for x in q2app.q2_app.db_data.db_schema.get_schema_tables() if not x.startswith("log_")],
         title="Select table",
         column_title="Table",
     )

q2rad-0.1.209/q2rad/version.py

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

q2rad-0.1.208/q2rad/version.py

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