q2rad 0.1.234__py3-none-any.whl → 0.1.236__py3-none-any.whl

q2rad/q2utils.py

@@ -503,10 +503,11 @@ class Q2_save_and_run:
 
 
 class auto_filter:
-    def __init__(self, form_name, mem, lines_per_tab=10):
+    def __init__(self, form_name, mem, lines_per_tab=10, exclude=[]):
         self.form_name = form_name
         self.mem = mem
         self.filter_columns = []
+        self.exclude = exclude
         self.mem.ok_button = True
         self.mem.cancel_button = True
         self.mem.add_ok_cancel_buttons()
@@ -515,6 +516,12 @@ class auto_filter:
         self.auto_filter()
 
     def auto_filter(self):
+        if len(self.exclude) > 0:
+            exclude_columns = " and column not in ("
+            exclude_columns += ",".join([f'"{x}"' for x in self.exclude]) + ")"
+        else:
+            exclude_columns = ""
+
         cu = q2cursor(
             f"""
                 select *
@@ -523,16 +530,20 @@ class auto_filter:
                     and migrate<>''
                     and (label <>'' or gridlabel <> '')
                     and noform = ''
+                    {exclude_columns}
                 order by seq
             """,
             self.mem.q2_app.db_logic,
         )
+        manual_controls_count = len(self.mem.controls)
         make_tabs = cu.row_count() > self.lines_per_tab
         if not make_tabs:
             self.mem.add_control("/f")
         for col in cu.records():
+            if col["column"] in self.exclude:
+                continue
             if make_tabs and cu.current_row() % self.lines_per_tab == 0:
-                self.mem.add_control("/t", f"Tab #{1+ cu.current_row() // self.lines_per_tab}")
+                self.mem.add_control("/t", f"={1+ cu.current_row() // self.lines_per_tab}")
                 self.mem.add_control("/f")
             if col["control"] == "text":
                 col["control"] = "line"
@@ -568,6 +579,9 @@ class auto_filter:
 
                 self.mem.add_control(**col)
         self.mem.add_control("/")
+        if manual_controls_count > 0:
+            for x in range(manual_controls_count):
+                self.mem.controls.append(self.mem.controls.pop(0))
         self._valid = self.mem.valid
         self.mem.valid = self.valid
 

q2rad/version.py

@@ -1 +1 @@
-__version__ = "0.1.234"
+__version__ = "0.1.236"

{q2rad-0.1.234.dist-info → q2rad-0.1.236.dist-info}/METADATA

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

{q2rad-0.1.234.dist-info → q2rad-0.1.236.dist-info}/RECORD

@@ -16,10 +16,10 @@ q2rad/q2rad.py,sha256=TFb2uluiMwqsv34nH7bMWZWGo2QOyi_rWMTVgHfda20,57283
 q2rad/q2raddb.py,sha256=9sQuod4Ws0xiWu4ejv1lODMSUtijJTUHGgCKmV61qGQ,5975
 q2rad/q2reports.py,sha256=tAOm54_P_NN8nRDsZy8N6vbw0YOTNQ_9xtvT6NMG724,86155
 q2rad/q2stylesettings.py,sha256=_aK-44kFfkaEGdwH7FzRs1KP7nsP08bL8t8OmdjM2eY,4767
-q2rad/q2utils.py,sha256=AEKNWCYkeYHPYtxKqEhIOeSBZDGLB0KoEGu7dkmAZrw,18964
-q2rad/version.py,sha256=UlEUs5F9_PU-hfXEOWasm-pL8DFirM12n-X6V8yWJmg,23
-q2rad-0.1.234.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.234.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.234.dist-info/METADATA,sha256=9s7lAgzSPVlSu8K_q0MkUs4rO8gAm2TGSu0I1RvnfoI,3369
-q2rad-0.1.234.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.234.dist-info/RECORD,,
+q2rad/q2utils.py,sha256=sk8r8Zi7bbaBuvkiXHD71mQyZvz82YgIqOOk8bTtNbg,19552
+q2rad/version.py,sha256=L6_bHEVo7xD1ZecpxdpAYgRNQMYvgyL0dOQAEe3tntc,23
+q2rad-0.1.236.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.236.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
+q2rad-0.1.236.dist-info/METADATA,sha256=7JBZ1zNaHhwcvgkSjeHO_mtvbEo4dLH4Yi6jDbrqJGM,3369
+q2rad-0.1.236.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+q2rad-0.1.236.dist-info/RECORD,,