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

q2rad/q2appmanager.py

@@ -165,6 +165,7 @@ class AppManager(Q2Form):
                                 control="button",
                                 # datalen=14,
                                 valid=self.export_q2market,
+                                style="background:LightCoral",
                             )
                         self.add_control("/")
 
@@ -186,6 +187,7 @@ class AppManager(Q2Form):
                             control="button",
                             # datalen=10,
                             valid=self.import_app_all,
+                            style="background:red",
                         )
                         if self.q2_app.app_url:
                             self.add_control(

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/q2raddb.py

@@ -170,7 +170,7 @@ def rollback(q2_db=None):
 
 
 def today():
-    return datetime.date.today()
+    return str(datetime.date.today())
 
 
 def ensure_empty_pk(table="", row={}, q2_db=None):
@@ -212,12 +212,15 @@ def last_day_of_month(date):
 
 def ffinder(module_name="module", function_name="fname"):
     from q2rad.q2rad import run_module
+
     glo = {}
     glo.update(globals())
-    run_module(module_name, import_only=True, _globals = glo)
+    run_module(module_name, import_only=True, _globals=glo)
     if function_name in glo:
         return glo[function_name]
     else:
+
         def empty_function(*args, **kwargs):
             pass
-        return empty_function
+
+        return empty_function

q2rad/q2utils.py

@@ -536,6 +536,7 @@ class auto_filter:
                 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 (
@@ -567,10 +568,13 @@ class auto_filter:
 
                 self.mem.add_control(**col)
         self.mem.add_control("/")
+        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.232"
+__version__ = "0.1.234"

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

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

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

@@ -1,7 +1,7 @@
 q2rad/__init__.py,sha256=Y0Up-UTXOmCYC9llNmTF10CpDDgF2kv10pyHT3-YwmQ,183
 q2rad/__main__.py,sha256=zP4JARM-FzFHM-vWLehx7c5N4v4m_F-TuMobCdFzr4Q,824
 q2rad/q2actions.py,sha256=sZftIHXmrVRnmkHVA51foSyAel9ziIa82rAZq03OPh4,8342
-q2rad/q2appmanager.py,sha256=gLvfy7bbzsLkHwHCM19RtLtqjwXGgrxM-EMaG21bTSc,22159
+q2rad/q2appmanager.py,sha256=2k5ZAtmsMVW8eBgLwM92d491-LCgQl5EberwUH2nugM,22276
 q2rad/q2appselector.py,sha256=bjl4MDg9DoU1h6NZOQDElaIGURjVQwiHnsUwr3kp3nc,18813
 q2rad/q2constants.py,sha256=dQtN4OMvZw0FATDAFYjolI7eGMVUnNnbTl6qM-ggZ4I,3416
 q2rad/q2extensions.py,sha256=0p-XKYnwt6WhxZ90uaTcliNAas2GrqdmCyNr8i1-0Y8,7602
@@ -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/q2raddb.py,sha256=1Xw3W73JJqp-emy4pGEqzYEvDCA3EbKMDVJk9vy06yQ,5964
+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=FwSYgLlE8ExqN9mkSh_78doEimT4pLCcI6iBn8mpodo,23
-q2rad-0.1.232.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.232.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.232.dist-info/METADATA,sha256=TVwh3o1KRP-HLO02zJ5REbPrTaFQo-zoiQRz0bs4Rn8,3369
-q2rad-0.1.232.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.232.dist-info/RECORD,,
+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,,