q2rad 0.1.233__py3-none-any.whl → 0.1.235__py3-none-any.whl

q2rad/q2rad.py

@@ -699,11 +699,11 @@ class Q2RadApp(Q2App):
                     else "q2rad/bin/q2rad\n"
                 ),
             )
-        elif os.path.isdir("python.loc"):
+        elif os.path.isdir(f"python.loc.{sys.version.split()[0]}"):
             self.write_restore_file(
                 "run_q2rad",
                 ("" if "win32" in sys.platform else "#!/bin/bash\n")
-                + ("python.loc\\scripts\\q2rad" if "win32" in sys.platform else "python.loc/bin/q2rad\n"),
+                + (f"python.loc.{sys.version.split()[0]}\\scripts\\q2rad" if "win32" in sys.platform else f"python.loc.{sys.version.split()[0]}/bin/q2rad\n"),
             )
         else:
             self.write_restore_file(
@@ -713,10 +713,16 @@ class Q2RadApp(Q2App):
             )
 
         if "win32" in sys.platform:
-            open("run_q2rad.vbs", "w").write(
-                'WScript.CreateObject("WScript.Shell").Run '
-                '"q2rad\\scripts\\pythonw.exe -m q2rad", 0, false'
-            )
+            if os.path.isdir(f"python.loc.{sys.version.split()[0]}"):
+                open("run_q2rad.vbs", "w").write(
+                    'WScript.CreateObject("WScript.Shell").Run '
+                    f'"python.loc.{sys.version.split()[0]}\\pythonw.exe -m q2rad", 1, false'
+                )
+            else:  # venv
+                open("run_q2rad.vbs", "w").write(
+                    'WScript.CreateObject("WScript.Shell").Run '
+                    '"q2rad\\scripts\\pythonw.exe -m q2rad", 1, false'
+                )
 
             open("make_shortcut.vbs", "w").write(
                 'Set oWS = WScript.CreateObject("WScript.Shell")\n'
@@ -733,10 +739,10 @@ class Q2RadApp(Q2App):
     def write_reinstall_files(self):
         if sys.prefix != sys.base_prefix:  # in virtualenv
             pip_command = (
-                "q2rad\\scripts\\python -m " if "win32" in sys.platform else "q2rad/script/python -m "
+                "q2rad\\scripts\\python -m " if "win32" in sys.platform else "q2rad/bin/python -m "
             )
-        elif os.path.isdir("python.loc"):
-            pip_command = "python.loc\\python  -m " if "win32" in sys.platform else "python.loc/python -m "
+        elif os.path.isdir(f"python.loc.{sys.version.split()[0]}"):
+            pip_command = f"python.loc.{sys.version.split()[0]}\\python  -m " if "win32" in sys.platform else f"python.loc{sys.version.split()[0]}/python -m "
         else:
             pip_command = "python  -m " if "win32" in sys.platform else "python  -m "
 

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,19 +530,24 @@ 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"
+                col["datatype"] = "char"
             col = Q2Controls.validate(col)
             self.filter_columns.append(cu.r.column)
             if col["datatype"] in ["date"] or (
@@ -566,11 +578,17 @@ class auto_filter:
                 col["check"] = 1
 
                 self.mem.add_control(**col)
-        self.mem.add_control("/")
+        # 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
 
     def valid(self):
         where = []
+        if custom_whr := self._valid():
+            where.append(custom_whr)
         for x in self.filter_columns:
             where.append(self.mem.prepare_where(x))
         where_string = " and ".join([x for x in where if x])

q2rad/version.py

@@ -1 +1 @@
-__version__ = "0.1.233"
+__version__ = "0.1.235"

{q2rad-0.1.233.dist-info → q2rad-0.1.235.dist-info}/METADATA

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

{q2rad-0.1.233.dist-info → q2rad-0.1.235.dist-info}/RECORD

@@ -12,14 +12,14 @@ q2rad/q2market.py,sha256=RNXTNv-fFUgbzBGhHPNXlzGjsAHAtz71BRbTErJarNo,2641
 q2rad/q2modules.py,sha256=RwemVJwfxth0lBN4K96tKz62VOW71C7CmmKyhIoH5mc,4632
 q2rad/q2packages.py,sha256=y72L1RAw1OgtKGaL8lJ1KHIaers5I6kTZSiphwwrY0M,3808
 q2rad/q2queries.py,sha256=YYJEpC_0rXAV8W_lx2604yqnkooHzheFmDCfqbW02zY,13203
-q2rad/q2rad.py,sha256=2eda5Rp0eLNd598e52EPK2KDzo3ZWFR_ODSrYHsNBuw,56787
+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=zI2WN2vA9NC40_M2S-b7UJ2kalAGeRBqRaDFfe0XFbs,18805
-q2rad/version.py,sha256=r9uCYaQt8NnDU4D0J1v8fGU7KC5hBvg-wZHF3sZzB3o,23
-q2rad-0.1.233.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.233.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.233.dist-info/METADATA,sha256=fiehcbR6hH7w_dDxbwnNckxGQCvzdLIoCbtij5pROuM,3369
-q2rad-0.1.233.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.233.dist-info/RECORD,,
+q2rad/q2utils.py,sha256=rZe4sxpXU0UCg1s50zueQOgX0GCt_d7OYR3s5p0v9ek,19554
+q2rad/version.py,sha256=Ha3i0TzVJUOaC3CSX9IQT4bWoilQPZfSI4LPVJpLuuQ,23
+q2rad-0.1.235.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.235.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
+q2rad-0.1.235.dist-info/METADATA,sha256=9C_6xcIaaZMeF0F6FCTADHl7p0VusLOs87T_Xe1xw3A,3369
+q2rad-0.1.235.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+q2rad-0.1.235.dist-info/RECORD,,