q2rad 0.1.185__tar.gz → 0.1.186__tar.gz

{q2rad-0.1.185 → q2rad-0.1.186}/PKG-INFO

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

{q2rad-0.1.185 → q2rad-0.1.186}/pyproject.toml

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

{q2rad-0.1.185 → q2rad-0.1.186}/q2rad/q2actions.py

@@ -147,15 +147,15 @@ class Q2Actions(Q2Form, Q2_save_and_run):
     def copy_to(self):
         rows = self.get_grid_selected_rows()
         choice = choice_form()
-        seq = (
-            int_(
-                q2cursor(
-                    f"select max(seq) as maxseq from actions where name='{choice['name']}'", q2app.q2_app.db_logic
-                ).r.maxseq
-            )
-            + 1
-        )
         if choice:
+            seq = (
+                int_(
+                    q2cursor(
+                        f"select max(seq) as maxseq from actions where name='{choice['name']}'", q2app.q2_app.db_logic
+                    ).r.maxseq
+                )
+                + 1
+            )
             for x in rows:
                 rec = self.model.get_record(x)
                 rec["seq"] = seq

{q2rad-0.1.185 → q2rad-0.1.186}/q2rad/q2appselector.py

@@ -67,7 +67,7 @@ class Q2AppSelect(Q2Form):
     def define_form(self):
         self.add_control("uid", "", datatype="int", pk="*", noform=1, nogrid=1)
         if self.add_control("/h"):
-            self.add_control("ordnum", _("Order"), datatype="int")
+            self.add_control("seq", _("Order"), datatype="int")
             self.add_control(
                 "autoselect",
                 label=_("Autoload"),
@@ -197,9 +197,8 @@ class Q2AppSelect(Q2Form):
         self.before_form_show = self.before_form_show
         self.before_crud_save = self.before_crud_save
 
-        cursor: Q2Cursor = self.db.table(table_name="applications", order="ordnum")
-        model = Q2CursorModel(cursor)
-        self.set_model(model)
+        cursor: Q2Cursor = self.db.table(table_name="applications", order="seq")
+        self.set_cursor(cursor)
 
         self.actions.add_action("/crud")
 

{q2rad-0.1.185 → q2rad-0.1.186}/q2rad/q2lines.py

@@ -273,20 +273,20 @@ class Q2Lines(Q2Form, Q2_save_and_run):
     def copy_to(self):
         rows = self.get_grid_selected_rows()
         choice = choice_form()
-        seq = (
-            int_(
-                q2cursor(
-                    f"select max(seq) as maxseq from lines where name='{choice['name']}'", q2app.q2_app.db_logic
-                ).r.maxseq
-            )
-            + 1
-        )
-        print(seq)
         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
+            )
             for x in rows:
                 rec = self.model.get_record(x)
                 rec["seq"] = seq
-                rec["name"] = choice['name']
+                rec["name"] = choice["name"]
                 seq += 1
                 if not insert("lines", rec, q2app.q2_app.db_logic):
                     print(last_error(q2app.q2_app.db_logic))
@@ -391,22 +391,22 @@ class Q2Lines(Q2Form, Q2_save_and_run):
     def select_linked_table(self):
         choice = choice_table()
         if choice:
-            self.s.to_table = choice['table']
+            self.s.to_table = choice["table"]
 
     def select_linked_table_pk(self):
         if self.s.to_table:
             choice = choice_column(self.s.to_table)
             if choice:
-                self.s.to_column = choice['col']
+                self.s.to_column = choice["col"]
 
     def select_linked_table_column(self):
         if self.s.to_table:
             choice = choice_column(self.s.to_table)
             if choice:
                 self.s.related += ", " if self.s.related else ""
-                self.s.related += choice['col']
+                self.s.related += choice["col"]
 
     def select_linked_form(self):
         choice = choice_form()
         if choice:
-            self.s.to_form = choice['name']
+            self.s.to_form = choice["name"]

q2rad-0.1.186/q2rad/version.py

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

q2rad-0.1.185/q2rad/version.py

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