Commit graph

1326 commits

Author SHA1 Message Date
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
wandji20
703259bb1f Add team to task list serializer and service [SCI-10266] 2024-02-22 13:38:24 +01:00
Anton
41e92dd1e2 Fix multiple resize [SCI-10245] 2024-02-21 19:44:22 +01:00
Anton
ed0db94089 Merge branch 'develop' into features/new-datatable 2024-02-21 12:51:17 +01:00
Giga Chubinidze
caab8fbc38 removed repository id query [SCI-10100] 2024-02-21 04:31:49 +04:00
Ivan Kljun
2827dd3de3 Refactor fetching/applying table state [SCI-10163] 2024-02-19 15:26:51 +01:00
Giga Chubinidze
26881eccdb Fixed repository id column [SCI-10100] 2024-02-19 02:55:18 +04:00
Giga Chubinidze
a164eec850 Implement sorting on all columns of tables revamped in v.1 [SCI-10100] 2024-02-09 03:32:43 +04:00
Ivan Kljun
5276faa74b Fix applying last_modified_by at asset update [SCI-10033] 2024-02-07 15:31:13 +01:00
Anton
29fd71c76a Fix sanity checks issues [SCI-10095] 2024-02-07 12:23:21 +01:00
Alex Kriuchykhin
342e9dbb19
Switch to asset text extraction with ActiveStorage analyzer [SCI-9954] (#6956) 2024-02-05 16:24:06 +01:00
Martin Artnik
baa5a57822
Merge pull request #7002 from ivanscinote/SCI-10033-ik
Update last_modified_by for assets on edit [SCI-10033]
2024-02-01 10:19:08 +01:00
aignatov-bio
7ac549e20d
Revert "Bug fixes from table sanity check - Part 2(inventories, tasks) [SCI-10095]" 2024-02-01 09:36:13 +01:00
Martin Artnik
a06cf058f1
Merge pull request #7036 from G-Chubinidze/gc_SCI_10095
Bug fixes from table sanity check - Part 2(inventories, tasks) [SCI-10095]
2024-02-01 09:28:55 +01:00
Giga Chubinidze
a853df18bc Bug fixes from table sanity check - Part 2(inventories, tasks) [SCI-10095] 2024-02-01 05:30:10 +04:00
ajugo
9d48cbbb86
Improve error handling for label printing [SCI-10039] (#6997) 2024-01-31 11:10:11 +01:00
Anton
72b40a63a0 Merge branch 'develop' into features/new-datatable 2024-01-30 12:02:04 +01:00
Ivan Kljun
67d78092b4 Implement search on PET tables [SCI-10081] 2024-01-26 09:29:39 +01:00
Oleksii Kriuchykhin
384afbcc4b Merge branch 'features/asset-sync' into develop 2024-01-25 11:32:26 +01:00
Ivan Kljun
24faeae5de Update last_modified_by for assets on edit [SCI-10033] 2024-01-24 15:18:34 +01:00
Martin Artnik
bd4471b98b
Merge pull request #6865 from G-Chubinidze/gc_SCI_9840
"Move" feature for multiple selected tasks and experiments (bulk action) [SCI-9840]
2024-01-23 14:32:23 +01:00
ajugo
53253b462e
Fix loading project activites [SCI-10034] (#6977) 2024-01-22 15:32:30 +01:00
Anton
4b3666b4f8 Merge branch 'develop' into features/new-datatable 2024-01-19 11:10:32 +01:00
Anton
af811db890 Remove old tables code [SCI-10006] 2024-01-16 14:13:40 +01:00
Alex Kriuchykhin
a43eacaa22
Fix inclusion of relationships column in repository exports [SCI-9716] (#6954) 2024-01-16 13:07:11 +01:00
sboursen-scinote
a55f79e4e4 Force quoting of csv fields for repository export [SCI-9673] 2024-01-12 10:38:37 +01:00
Anton
7233f4c8ab Merge branch 'features/new-datatable' of github.com:scinote-eln/scinote-web into features/new-datatable 2024-01-11 15:27:10 +01:00
aignatov-bio
37919d8346
Merge pull request #6926 from aignatov-bio/ai-sci-9803-replace-reports-table
Replace reports table [SCI-9803]
2024-01-11 15:26:52 +01:00
Anton
707042adc7 Merge branch 'features/new-datatable' of github.com:scinote-eln/scinote-web into features/new-datatable 2024-01-11 15:16:08 +01:00
Anton
de72f60cc1 Merge branch 'develop' into features/new-datatable 2024-01-11 15:14:36 +01:00
Anton
62edf89699 Replace reports table [SCI-9803] 2024-01-11 10:06:39 +01:00
aignatov-bio
3194a28106
Merge pull request #6907 from aignatov-bio/ai-sci-9939-fix-filter-component
Refactor filter component [SCI-9939]
2024-01-09 14:01:14 +01:00
Anton
3346c55941 Merge branch 'develop' into features/new-datatable 2024-01-09 10:36:21 +01:00
ajugo
a6c0c7294b
Improve objects loading and permissions checking for repository rows [SCI-9763] (#6875) 2024-01-09 09:37:50 +01:00
Anton
efdc42604e Refactor filter component [SCI-9939] 2024-01-08 18:36:01 +01:00
Anton
993a8da518 Migrate inventory tables [SCI-9804] 2024-01-05 19:03:14 +01:00
ajugo
9e26d24dc9
Reset relationship counter when duplication repository row [SCI-9930] (#6881) 2024-01-05 14:47:44 +01:00
Oleksii Kriuchykhin
95ab33a58b Merge branch 'develop' into features/inventory-items-relationships 2024-01-05 11:27:32 +01:00
Anton
4671754d52 Migrate protocols table [SCI-9802] 2024-01-03 14:57:32 +01:00
Giga Chubinidze
cc8a10edb0 "Move" feature for multiple selected tasks and experiments (bulk action) 2023-12-29 12:53:46 +04:00
wandji
184944dd5f
Improve interface and interaction of relationships column [SCI-9893] (#6851)
* Improve interface and interaction of relationships column [SCI-9893]

* Fix failling specs (use column order than relationships for sorting) [SCI-9893]
2023-12-21 12:32:35 +01:00
Anton
79969492dd Replace tasks table [SCI-9801] 2023-12-20 17:47:09 +01:00
Alex Kriuchykhin
43329dc318
Fix imports of protocols with tables from Protocols.io [SCI-9723] (#6839) 2023-12-19 10:39:16 +01:00
ajugo
668ae018c1
Fix activity to_date filtering [SCI-9704] (#6840) 2023-12-18 16:28:41 +01:00
Alex Kriuchykhin
528d411910
e2e - modified and added new tags at inventories section [SCI-9813] (#6741) (#6832)
Co-authored-by: Martin Artnik <martin@scinote.net>
Co-authored-by: mvrazic <144342580+mvrazic@users.noreply.github.com>
2023-12-15 16:33:13 +01:00
Alex Kriuchykhin
447d279a87
Fix activity filter matching by date [SCI-9890] (#6826) 2023-12-14 16:11:16 +01:00
Anton
985dddef17 Finish experiment table [SCI-9800] 2023-12-11 15:57:45 +01:00
Anton
75f7437001 Fix markup 2023-12-11 09:26:13 +01:00
Anton
7ffad5b659 Experiments table migration [SCI-9800] 2023-12-07 12:53:21 +01:00
Anton
65e9e5abb4 Merge branch 'develop' into features/new-datatable 2023-12-07 09:51:45 +01:00
Anton
687bac024a Migrate access modal to VUE [SCI-9799] 2023-12-06 14:12:22 +01:00
Soufiane
8e25b95e83
Respect the order of the item relationship column when exporting inventory [SCI-9673] (#6706) 2023-12-06 10:24:07 +01:00
Anton
9971de5c4c Finalize projects table 2023-12-01 09:56:14 +01:00
wandji20
13a675065d Fix bug in exports- [SCI-9716] 2023-11-29 11:21:34 +01:00
wandji20
ca85ea0eb4 Add relationship to project exports and fix vue 3 upgrade for item relationship modal [SCI-9716] 2023-11-28 12:58:55 +01:00
Anton
8f862f3290 Minor visual changes 2023-11-28 10:48:01 +01:00
Oleksii Kriuchykhin
fa35de6a58 Merge branch 'develop' into features/inventory-items-relationships 2023-11-24 14:04:18 +01:00