q2rad 0.1.203__py3-none-any.whl → 0.1.204__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of q2rad might be problematic. Click here for more details.

q2rad/q2lines.py CHANGED
@@ -188,6 +188,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
188
188
  _("?"),
189
189
  mess=_("Open list of existing tables"),
190
190
  control="button",
191
+ datalen=2,
191
192
  valid=self.select_linked_table,
192
193
  )
193
194
  self.add_control("to_table", gridlabel=_("To table"), datatype="char", datalen=100)
@@ -198,6 +199,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
198
199
  _("?"),
199
200
  mess=_("Open list of existing tables"),
200
201
  control="button",
202
+ datalen=2,
201
203
  valid=self.select_linked_table_pk,
202
204
  )
203
205
  self.add_control("to_column", gridlabel=_("To field"), datatype="char", datalen=100)
@@ -209,6 +211,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
209
211
  _("?"),
210
212
  mess=_("Open list of existing columns"),
211
213
  control="button",
214
+ datalen=2,
212
215
  valid=self.select_linked_table_column,
213
216
  )
214
217
  self.add_control("/")
@@ -222,6 +225,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
222
225
  _("?"),
223
226
  mess=_("Open list of existing forms"),
224
227
  control="button",
228
+ datalen=2,
225
229
  valid=self.select_linked_form,
226
230
  )
227
231
  self.add_control("to_form", gridlabel=_("Form to open"), datatype="char", datalen=100)
@@ -328,11 +332,11 @@ class Q2Lines(Q2Form, Q2_save_and_run):
328
332
 
329
333
  if last < self.model.row_count():
330
334
  last_seq = int_(self.model.get_record(last)["seq"]) + 1
331
- self.move_rows_down(last, False)
335
+ self.move_rows_down(last)
332
336
  else:
333
337
  last_seq = int_(self.model.get_record(self.model.row_count() - 1)["seq"]) + 2
334
338
 
335
- self.move_rows_down(first, False)
339
+ self.move_rows_down(first)
336
340
  self.model.insert({"column": layout_type, "seq": first_seq})
337
341
  self.model.insert({"column": "/", "seq": last_seq})
338
342
  self.refresh()
@@ -342,7 +346,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
342
346
  current_row = self.current_row
343
347
  for x in range(current_row, self.model.row_count()):
344
348
  rec = self.model.get_record(x)
345
- self.model.update({"id": rec["id"], "seq": 1 + int_(rec["seq"])})
349
+ self.model.update({"id": rec["id"], "seq": 1 + int_(rec["seq"])}, refresh=False)
346
350
  if refresh:
347
351
  self.refresh()
348
352
 
@@ -357,17 +361,22 @@ class Q2Lines(Q2Form, Q2_save_and_run):
357
361
 
358
362
  def seek_end():
359
363
  nonlocal last_row
364
+ same_panel = 0
360
365
  while last_row < self.model.row_count():
361
366
  self.set_grid_index(last_row)
362
- # if is_panel_start():
363
- # break
364
- if is_panel_end():
365
- break
367
+ if is_panel_start():
368
+ same_panel += 1
369
+ elif is_panel_end():
370
+ if same_panel == 1:
371
+ break
372
+ else:
373
+ same_panel -= 1
366
374
  last_row += 1
367
375
 
368
376
  def seek_start():
369
- in_panel = -1 if is_panel_end() else 0
370
377
  nonlocal first_row
378
+ self.set_grid_index(first_row)
379
+ in_panel = -1 if is_panel_end() else 0
371
380
  while first_row > 0:
372
381
  self.set_grid_index(first_row)
373
382
  if is_panel_start():
@@ -381,6 +390,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
381
390
 
382
391
  if not is_panel_start():
383
392
  seek_start()
393
+ last_row = first_row
384
394
  if not is_panel_end():
385
395
  seek_end()
386
396
  self.set_grid_selected_rows([x for x in range(first_row, last_row + 1)])
q2rad/q2utils.py CHANGED
@@ -492,13 +492,14 @@ class Q2_save_and_run:
492
492
 
493
493
 
494
494
  class auto_filter:
495
- def __init__(self, form_name, mem):
495
+ def __init__(self, form_name, mem, lines_per_tab=10):
496
496
  self.form_name = form_name
497
497
  self.mem = mem
498
498
  self.filter_columns = []
499
499
  self.mem.ok_button = True
500
500
  self.mem.cancel_button = True
501
501
  self.mem.add_ok_cancel_buttons()
502
+ self.lines_per_tab = lines_per_tab
502
503
 
503
504
  self.auto_filter()
504
505
 
@@ -515,8 +516,13 @@ class auto_filter:
515
516
  """,
516
517
  self.mem.q2_app.db_logic,
517
518
  )
518
- self.mem.add_control("/f")
519
+ make_tabs = cu.row_count() > self.lines_per_tab
520
+ if not make_tabs:
521
+ self.mem.add_control("/f")
519
522
  for col in cu.records():
523
+ if make_tabs and cu.current_row() % self.lines_per_tab == 0:
524
+ self.mem.add_control("/t", f"Tab #{1+ cu.current_row() // self.lines_per_tab}")
525
+ self.mem.add_control("/f")
520
526
  if col["control"] == "text":
521
527
  col["control"] = "line"
522
528
  col = Q2Controls.validate(col)
@@ -538,6 +544,7 @@ class auto_filter:
538
544
  col["check"] = 1
539
545
 
540
546
  self.mem.add_control(**col)
547
+ self.mem.add_control("/")
541
548
  self.mem.valid = self.valid
542
549
 
543
550
  def valid(self):
q2rad/version.py CHANGED
@@ -1 +1 @@
1
- __version__ = "0.1.203"
1
+ __version__ = "0.1.204"
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: q2rad
3
- Version: 0.1.203
3
+ Version: 0.1.204
4
4
  Summary: RAD - database, GUI, reports
5
5
  Author: Andrei Puchko
6
6
  Author-email: andrei.puchko@gmx.de
@@ -5,7 +5,7 @@ q2rad/q2appmanager.py,sha256=pdEdyTXWr9zjdZgVmfNXJrjDmQ_Ntq21udhD1b4vA2I,15975
5
5
  q2rad/q2appselector.py,sha256=PZWSXaiUswinB_Zj1Q8fyRhzqK9ViB8lUHlNVUr85rI,18597
6
6
  q2rad/q2constants.py,sha256=dQtN4OMvZw0FATDAFYjolI7eGMVUnNnbTl6qM-ggZ4I,3416
7
7
  q2rad/q2forms.py,sha256=A5VeBK8OdE3zn0L1TgvCk4OjpB1nLibJqBFfpVZr_Uc,10181
8
- q2rad/q2lines.py,sha256=yHQAEULVt9FTSgZa3atnoTSBSXMHCEMCjAK08ARhNMc,17167
8
+ q2rad/q2lines.py,sha256=aMWGvZRj6JAwPTsiFqO4i4PvfkFGolc-ZF55MgVz-Ac,17535
9
9
  q2rad/q2make.py,sha256=wXoyBUwf2zaAl9JjWDCbjAteUElRq0O7ippyaMY9eug,6476
10
10
  q2rad/q2market.py,sha256=nyIBhZYqxNSlBXpcxdBRQ1vGSzWV8jI4cQoVa9JdRhE,2589
11
11
  q2rad/q2modules.py,sha256=N3OkUKfiwVZtmDyAtnJcs2Rprd7uIHd0HhjHTyFoN_s,4294
@@ -15,10 +15,10 @@ q2rad/q2rad.py,sha256=IYQQaTGRagUTWTuhS8Jy8ua2ERCuTlBaCKC4DRP9pDY,46031
15
15
  q2rad/q2raddb.py,sha256=ISqT5EBFO7eaXcQRNpA0hMiRU84kbd-FcfckwKMlGfs,4506
16
16
  q2rad/q2reports.py,sha256=Q-bZONOSDDQPrLziHTpW_L6FS82CkWzxITkv5EX5x98,84439
17
17
  q2rad/q2stylesettings.py,sha256=rEJLyLzsffJEXnMbg9bPB3KHLjYfw-49QgrtcYOfGV0,4769
18
- q2rad/q2utils.py,sha256=tLiDYgGGUCUwDRpyxirIc3xe0hPquzXhYvJw6bL-8jI,19219
19
- q2rad/version.py,sha256=ibT5FfNRP69rFPNhBV9hZ1u7zlfZmf4fSwvzMRzfu_o,23
20
- q2rad-0.1.203.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
21
- q2rad-0.1.203.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
22
- q2rad-0.1.203.dist-info/METADATA,sha256=1JfnGyY7aSvHk4kupptJBiIJtGIZwoco4ps6rV1AMxo,3369
23
- q2rad-0.1.203.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
24
- q2rad-0.1.203.dist-info/RECORD,,
18
+ q2rad/q2utils.py,sha256=QInWNqLaDDvmd0PKDZHrsp3Jx6Nqm_klzUinDCwgJJM,19619
19
+ q2rad/version.py,sha256=BOgsQp_IQqtFBVARMpunZ_K4jeffpFlASiKFPv3ht4c,23
20
+ q2rad-0.1.204.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
21
+ q2rad-0.1.204.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
22
+ q2rad-0.1.204.dist-info/METADATA,sha256=j1TfTr7zg36fuvTCBeDEo-tfTZGq4a2ucF_BudJSblA,3369
23
+ q2rad-0.1.204.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
24
+ q2rad-0.1.204.dist-info/RECORD,,