q2rad 0.1.193__py3-none-any.whl → 0.1.195__py3-none-any.whl

q2rad/q2actions.py

@@ -41,7 +41,7 @@ class Q2Actions(Q2Form, Q2_save_and_run):
         self.add_action("/crud")
         # self.add_seq_actions()
         self.add_action("Run", self.form_runner, hotkey="F4")
-        self.add_action("Copy to", icon="🧩", worker=self.copy_to)
+        self.add_action("Copy to", icon="❖", worker=self.copy_to)
 
     def create_form(self):
         self.add_control("id", "", datatype="int", pk="*", ai="*", noform=1, nogrid=1)

q2rad/q2lines.py

@@ -93,7 +93,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
         self.add_action("Fill", self.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)
+        self.add_action("Copy to", icon="❖", worker=self.copy_to)
         self.add_action("Move rows down", icon="⭸", worker=self.move_rows_down)
         self.add_action("Layout|Form", icon="☆", worker=lambda: self.add_layout("/f"))
         self.add_action("Layout|Horizontally", worker=lambda: self.add_layout("/h"))
@@ -117,6 +117,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
             self.add_control("/f")
             self.add_control("label", _("Form label"), datatype="char", datalen=100)
             self.add_control("gridlabel", _("Grid label"), datatype="char", datalen=100)
+            self.add_control("mess", _("Tooltip"), datatype="char", datalen=200)
             if self.add_control("/h"):
                 self.add_control("seq", _("Sequence number"), datatype="int")
                 self.add_control("nogrid", _("No grid"), control="check", datalen=1)

q2rad/q2rad.py

@@ -91,6 +91,9 @@ set_logging()
 _logger = logging.getLogger(__name__)
 
 
+class ReturnEvent(Exception):
+    pass
+
 def get_report(report_name="", style={}):
     if report_name == "":
         return Q2RadReport(style=style)
@@ -126,9 +129,6 @@ def run_module(module_name=None, globals=globals(), locals=locals(), script="",
         else:
             __name__ = "__main__"
 
-        class ReturnEvent(Exception):
-            pass
-
         locals.update(
             {
                 "RETURN": None,
@@ -141,9 +141,9 @@ def run_module(module_name=None, globals=globals(), locals=locals(), script="",
         )
         try:
             exec(code["code"], globals, locals)
-        except ReturnEvent:
+        except ReturnEvent as error:
             pass
-        except Exception:
+        except Exception as error:
             explain_error()
         return locals["RETURN"]
 
@@ -1015,6 +1015,7 @@ class Q2RadApp(Q2App):
                 `column`
                 , label
                 , gridlabel
+                , mess
                 , nogrid
                 , noform
                 , `check`
@@ -1129,23 +1130,41 @@ class Q2RadApp(Q2App):
         return form
 
     def code_compiler(self, script):
+        def count_leading_spaces(string):
+            count = 0
+            for char in string:
+                if char == " ":
+                    count += 1
+                else:
+                    break
+            return count
+
         if "return" in script or "?" in script or "import" in script:
             # modify script for
             new_script_lines = []
             in_def = False
+            in_def_indent = -1
             for x in script.split("\n"):
+                if x.strip() == "":
+                    continue
+                spaces_count = count_leading_spaces(x)
                 # when in_def is True  - do not modify return
-                if re.findall(r"^def|^class", x):
+                if in_def is False and re.findall(r"^\s*def|^\s*class", x):
                     in_def = True
-                elif not re.findall(r"^\s+", x):
+                    in_def_indent = spaces_count
+                elif spaces_count <= in_def_indent:
                     in_def = False
+                    in_def_indent = -1
                 # return
                 if in_def is False and re.findall(r"^\s*return\W*.*|;\s*return\W*.*", x):
                     if x.strip() == "return":
                         x = x.replace("return", "raise ReturnEvent")
                     else:
-                        x = x.replace("return", "RETURN = ") + "; raise ReturnEvent"
-                # print
+                        # x = x.replace("return", "RETURN = ") + ";raise ReturnEvent"
+                        # x = x.replace("\n", "").replace("\r", "") + ";raise ReturnEvent"
+                        x = x.replace("\n", "").replace("\r", "")
+                        x = x.replace("return", "RETURN =")
+                        x += ";raise ReturnEvent"
                 if re.findall(r"^\s*\?\W*.*", x):
                     # lets print it
                     x = x.split("?")[0] + "print(" + "".join(x.split("?")[1:]) + ")"
@@ -1182,10 +1201,6 @@ class Q2RadApp(Q2App):
 
         # to provide return ability for exec
         def real_runner(**args):
-            # make exec stop on return
-            class ReturnEvent(Exception):
-                pass
-
             __locals_dict = {
                 "RETURN": None,
                 "ReturnEvent": ReturnEvent,

q2rad/q2utils.py

@@ -266,7 +266,11 @@ class Q2Form(_Q2Form):
             def after_form_show():
                 query = self.model.get_table_name()
                 if not query.strip().lower().startswith("select "):
-                    query = f"select * from {query}"
+                    where = self.model.get_where()
+                    where = "" if where == "" else f" where {where}"
+                    order = self.model.get_order()
+                    order = "" if order == "" else f" order by {order}"
+                    query = f"select * from {query} {where} {order}"
                 form.query_edit.set_content({"queries": {"query": query}})
 
             form.after_form_show = after_form_show

q2rad/version.py

@@ -1 +1 @@
-__version__ = "0.1.193"
+__version__ = "0.1.195"

{q2rad-0.1.193.dist-info → q2rad-0.1.195.dist-info}/METADATA

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

{q2rad-0.1.193.dist-info → q2rad-0.1.195.dist-info}/RECORD

@@ -1,24 +1,24 @@
 q2rad/__init__.py,sha256=Y0Up-UTXOmCYC9llNmTF10CpDDgF2kv10pyHT3-YwmQ,183
 q2rad/__main__.py,sha256=zP4JARM-FzFHM-vWLehx7c5N4v4m_F-TuMobCdFzr4Q,824
-q2rad/q2actions.py,sha256=2eU5spoZJOxJYyENFjqyAr1HJbkycheEa7TUGOTiHZs,8035
+q2rad/q2actions.py,sha256=Xqrpm68e36KVzyrmbDP8wDJfh-C_PVS-YTCF5nAQdcU,8034
 q2rad/q2appmanager.py,sha256=uDm2sP49fS4sWn75NEEic0xxtFG0I780pLcxDBR4eME,15566
 q2rad/q2appselector.py,sha256=BHxrQLoR567tLo5CLSZvgcg4V51BvNCaA1U_EZyEZ7k,12596
 q2rad/q2constants.py,sha256=dQtN4OMvZw0FATDAFYjolI7eGMVUnNnbTl6qM-ggZ4I,3416
 q2rad/q2forms.py,sha256=A5VeBK8OdE3zn0L1TgvCk4OjpB1nLibJqBFfpVZr_Uc,10181
-q2rad/q2lines.py,sha256=OzfBk5VloCwmECXL__TX7eAReOhQkWMkPh7VN_FPVjQ,16005
+q2rad/q2lines.py,sha256=6p7vJI3m7bENIMrGgueIXP85b0Q2f-WmF8wz3HVHZdQ,16086
 q2rad/q2make.py,sha256=wXoyBUwf2zaAl9JjWDCbjAteUElRq0O7ippyaMY9eug,6476
 q2rad/q2market.py,sha256=koWwKKc1MVn0ud2XDu_dal8lBFEMLX8KABpZO_OzTIM,2597
 q2rad/q2modules.py,sha256=N3OkUKfiwVZtmDyAtnJcs2Rprd7uIHd0HhjHTyFoN_s,4294
 q2rad/q2packages.py,sha256=ifRu8LuVrrTphiJe1JUVED_KB2sHJCPVnZq9VEh3K8w,3473
 q2rad/q2queries.py,sha256=ABbr66YRLmleo2wcpvwcQwSPt_htjQsYXgoCqRRQSbo,12512
-q2rad/q2rad.py,sha256=cZLmsQIGlI3-MRfUfIE7jqcARKcq-NeFT5wswPub7hk,45038
+q2rad/q2rad.py,sha256=4bdQ3LtGN3pEYJj0VBTziJsMip_na7qj3NOUPejzjO8,45720
 q2rad/q2raddb.py,sha256=ISqT5EBFO7eaXcQRNpA0hMiRU84kbd-FcfckwKMlGfs,4506
 q2rad/q2reports.py,sha256=via1MQF5hfa-IGmzFwDmkEiNNHk0UhevM9yYhYs4DOs,83224
 q2rad/q2stylesettings.py,sha256=_aK-44kFfkaEGdwH7FzRs1KP7nsP08bL8t8OmdjM2eY,4767
-q2rad/q2utils.py,sha256=D6aeT-9txfhgNs8YLqcbmGKvVJFPndWjyvnasz8LyFA,18656
-q2rad/version.py,sha256=TWgZHYVi4bMIoQ77f_XsFEPOsa4MXv1-oMuLXpdJC3U,23
-q2rad-0.1.193.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.193.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.193.dist-info/METADATA,sha256=wVRivmtWNgNb1sB_WYZprAB4r69ziM5RVLS_6rvISDg,3369
-q2rad-0.1.193.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.193.dist-info/RECORD,,
+q2rad/q2utils.py,sha256=6Z7DOHcdRrWhAN_Fnx8WEi-fNqFqMOjO7diDe9YtXkU,18919
+q2rad/version.py,sha256=6YJwurLCGx_wb4Z5lwVX0N9YBV5tZ-iYDNPyghKfQVw,23
+q2rad-0.1.195.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.195.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
+q2rad-0.1.195.dist-info/METADATA,sha256=Ccz0GUlhbPeZIv8N6N2xKscuSpbXTbpZf--J0Z_hRMo,3369
+q2rad-0.1.195.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+q2rad-0.1.195.dist-info/RECORD,,