Commit graph

1282 commits

Author SHA1 Message Date
Anton
b3e4b14800 Add sorting to task comments 2024-05-09 12:08:33 +02:00
aignatov-bio
f87124b61e
Merge branch 'features/inventory-import-improvements' into gc_SCI_10534 2024-05-09 10:57:40 +02:00
aignatov-bio
6d74152414
Merge pull request #7246 from G-Chubinidze/gc_SCI_10200
Inventory export for checklists with return delimiter should escape the return sign [SCI-10200]
2024-04-26 10:12:01 +02:00
Ivan Kljun
24553a0db6 Merge remote-tracking branch 'upstream/features/inventory-import-improvements' into SCI-10550-ik 2024-04-11 13:19:10 +02:00
Ivan Kljun
d54ff46a93 Improve export inventories modals with file_type options of xslx/csv [SCI-10550] 2024-04-10 16:55:49 +02:00
Giga Chubinidze
419f141854 code cleanup [SCI-10507] 2024-04-09 06:20:23 +04:00
Giga Chubinidze
174a27e716 Enable "empty" inventory export [SCI-10507] 2024-04-09 06:18:20 +04:00
Giga Chubinidze
a0e9d04611 When exporting inventory items, do not convert smart annotation tags to text [SCI-10534] 2024-04-04 05:29:02 +04:00
Anton
45c96651cd Merge branch 'develop' into features/inventory-import-improvements 2024-04-03 14:49:00 +02:00
Andrej
cf79812b4b Fix experiment sorting by archived on [SCI-10563] 2024-04-02 12:41:32 +02:00
Ivan Kljun
e2c4f0c214 Merge remote-tracking branch 'upstream/features/inventory-import-improvements' into SCI-10268-ik 2024-03-28 12:32:43 +01:00
Martin Artnik
2aaf94051c Merge branch 'release/1.30.0' into develop 2024-03-26 14:23:21 +01:00
Gregor Lasnibat
411a182f25
Merge pull request #7291 from lasniscinote/gl_SCI_10399
(dev) Detect duplicated item IDs when parsing a spreadsheet [SCI-10399]
2024-03-25 13:03:44 +01:00
Gregor Lasnibat
640f3168bc (dev) Detect duplicated item IDs when parsing a spreadsheet [SCI-10399] 2024-03-25 11:52:53 +01:00
Martin Artnik
6b4ae0e59a Merge branch 'develop' into features/inventory-import-improvements 2024-03-25 10:20:13 +01:00
Andrej
63a0b2746b Fix handling of missing sorting parameters on tables [SCI-10491] 2024-03-21 09:08:55 +01:00
ajugo
1ad0ed4eb9
Fix generating of images for docx report [SCI-10431] (#7313) 2024-03-18 15:58:19 +01:00
Soufiane
94b5475728
Fix sorted reports table pagination [SCI-10359] (#7304) 2024-03-18 09:35:52 +01:00
G-Chubinidze
f7d9534d0e
Merge pull request #7289 from G-Chubinidze/gc_SCI_10404
Add the prefix beside the Item ID in the exported file [SCI-10404]
2024-03-15 15:58:59 +04:00
ajugo
773fcbef5e
Fix display active state view for archived objects [SCI-10446] (#7287) 2024-03-15 10:36:47 +01:00
Giga Chubinidze
d26d239b2b Add the prefix beside the Item ID in the exported file [SCI-10404] 2024-03-15 02:21:38 +04:00
Soufiane
3f4c4dd222
Fix sorted table pagination [SCI-10359] (#7264)
* Fix table pagination when sorting by columns with non unique values [SCI-10359]

* Refactor solution [SCI-10359]
2024-03-14 18:20:26 +01:00
Soufiane
5d4322cd8f
Fix sorting by description in label templates [SCI-10380] (#7258) 2024-03-14 13:23:52 +01:00
ajugo
3d1907d972
Fix exporting of empty folder [SCI-10427] (#7270) 2024-03-13 16:23:38 +01:00
Alex Kriuchykhin
5da0076eb8
Fix experiment carts sorting by number of completed tasks [SCI-10390] (#7213) 2024-03-12 14:37:14 +01:00
Soufiane
f90f06126a
Fix various issues with project export modal [SCI-10343] (#7245) 2024-03-12 14:14:16 +01:00
Martin Artnik
38601bbb40
Merge pull request #7163 from lasniscinote/gl_SCI_10222
(dev) Create a POC for Phase 0 of improved importing to inventories [SCI-10222]
2024-03-12 13:07:29 +01:00
Gregor Lasnibat
e8b4e40391 (dev) Create a POC for Phase 0 of improved importing to inventories [SCI-10222] 2024-03-11 15:55:36 +01:00
Giga Chubinidze
134a3393d4 rename loop variable [SCI-10200] 2024-03-11 17:39:20 +04:00
Giga Chubinidze
4ce4b90e3c Inventory export for checklists with return delimiter should escape the return sign [SCI-10200] 2024-03-11 17:27:13 +04:00
Soufiane
a9537f06dd
Fix tests after table revamp [SCI-10271] (#7220) 2024-03-11 13:08:42 +01:00
Oleksii Kriuchykhin
d004b1e7a0 Merge branch 'features/bugfixes' into develop 2024-03-08 11:21:26 +01:00
Ivan Kljun
1d96d37f4c Enable XLSX repository exports [SCI-10268] 2024-03-08 09:23:26 +01:00
Alex Kriuchykhin
c1263eb06f
Fix ordering by ID in protocols and tasks tables, remove obsolete protocols datatable [SCI-10387] (#7209) 2024-03-06 16:04:41 +01:00
ajugo
d2b097599f
Improve projects table loading speed [SCI-10147] (#7136) 2024-03-06 14:48:30 +01:00
wandji
690e0d421f
Add advance filter for relationships to inventory items table [SCI-10068] (#7007) 2024-03-06 13:48:15 +01:00
aignatov-bio
f0cd4a0b64
Merge pull request #7195 from rekonder/aj_SCI_10349
Fix project table sorting by users [SCI-10349]
2024-03-05 11:48:11 +01:00
Anton
a136b73d4f Fix protocols versions search [SCI-10378] 2024-03-05 11:34:05 +01:00
Andrej
27e1317888 Fix project table sorting by users [SCI-10349] 2024-03-04 15:29:31 +01:00
Andrej
cd80c850ed Fix project table sorting by users and comments column [SCI-10349] 2024-03-04 10:58:10 +01:00
aignatov-bio
1abd370d3e
Merge pull request #7158 from wandji20/wb-SCI-10292
Fix issue moving experiments [SCI-10292]
2024-02-29 13:29:33 +01:00
wandji20
53039ba5ee Improve code [SCI-10292] 2024-02-29 13:18:58 +01:00
Andrej
817326bd79 Add comments and updated on columns to Project table [SCI-10284] 2024-02-29 09:07:53 +01:00
Andrej
db43c96619 Add advance filtering to protocol template table [SCI-10288] 2024-02-28 15:21:09 +01:00
Anton
588f69efd7 Fix protocol sorting [SCI-10287] 2024-02-28 10:54:28 +01:00
aignatov-bio
c3ac951fd1
Merge pull request #7148 from sboursen-scinote/sb_SCI-10286
Show repositories that don't contain any items in the list [SCI-10286]
2024-02-28 10:30:13 +01:00
sboursen-scinote
47daae5b26 Show repositories that don't contain any items in the list [SCI-10286] 2024-02-27 21:05:30 +01:00
Giga Chubinidze
4488243fad hound fix [SCI-10100] 2024-02-27 16:41:20 +04:00
G-Chubinidze
f75d3b3952
Merge branch 'develop' into gc_SCI_101000 2024-02-27 16:38:04 +04:00
Giga Chubinidze
980468cb41 Added back backend code for table column sorting [SCI-10100] 2024-02-27 16:34:55 +04:00