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
Anton
7fdbc73098
Replace project table [SCI-9680]
2023-11-24 11:15:07 +01:00
wandji
2009d01532
Strip insignificant zero for ledger records in consumption export [SCI-9646] ( #6693 )
...
* Strip insignificant zero for ledger records when stock precision is zero [SCI-9646]
* Stip insignicant zeros for all stock ledger records in consumption exports [SCI-9646]
2023-11-23 17:35:51 +01:00
wandji
6c11c6641b
Fix double request for editing item card name [SCI-9771] ( #6696 )
...
* Fix double request for editing item card name [SCI-9771]
* Set repository cell to nil after deleting repository cell in row update service [SCI-9771]
2023-11-23 17:35:34 +01:00
Oleksii Kriuchykhin
01219f09eb
Merge branch 'develop' into features/inventory-items-relationships
2023-11-23 11:08:42 +01:00
Anton
38024d563a
Add initial table [SCI-9680]
2023-11-23 10:55:51 +01:00
Anton
8a0dd0258e
Merge branch 'develop' into features/new-datatable
2023-11-23 10:47:58 +01:00
Martin Artnik
854ecc0092
Merge pull request #6677 from artoscinote/ma_SCI_9693
...
Fix report result content toggling [SCI-9693]
2023-11-23 10:37:49 +01:00
Martin Artnik
64e192fac2
Fix report result content toggling [SCI-9693]
2023-11-21 13:05:07 +01:00
wandji
91f650e227
Reload inventory table after changes to item card [SCI-9617] ( #6626 )
...
* Reload inventory table row after changes to item card [SCI-9617]
* Reload full table after updating item card column [SCI-9617]
* Update 2 line if condition formatting style [SCI-9617]
2023-11-20 15:26:01 +01:00
wandji
0fc485705c
Fix issue with decimal precision on the manage stock modal and ledger exports [SCI-9646] ( #6641 )
2023-11-20 13:25:20 +01:00
Alex Kriuchykhin
43b8f97126
Improve handling of unshared inventories and unassigned items for stock ledger records [SCI-9504] ( #6565 )
2023-11-20 13:24:31 +01:00
Oleksii Kriuchykhin
fdb4e93e16
Merge branch 'features/inventory-item-card-edit' into features/inventory-items-relationships
2023-11-14 15:28:57 +01:00
Soufiane
f80046418a
Add relationship columns to inventory exports [SCI-9673] ( #6634 )
2023-11-14 11:57:11 +01:00
ajugo
5878ed0c7c
Fix unit test [SCI-9570] ( #6552 )
2023-11-13 09:34:38 +01:00
Anton
9abdc8698a
Refactor label templates backend [SCI-9676]
2023-11-09 17:12:18 +01:00
Anton
3211fa7cce
Merge branch 'features/new-datatable' of github.com:scinote-eln/scinote-web into features/new-datatable
2023-11-09 11:36:44 +01:00
Oleksii Kriuchykhin
ee76488f32
Merge branch 'develop' into features/inventory-item-card-edit
2023-10-27 14:25:32 +02:00
ajugo
a98d86e9b8
Add activities for cell editing on the new item card [SCI-9423] ( #6465 )
2023-10-24 16:22:10 +02:00
Soufiane
9809f696a2
FIX: Clearing inventory item filter fails with 500 or breaks UI [SCI-9345] ( #6358 )
2023-10-24 16:05:35 +02:00
Martin Artnik
2850135e96
Revert "Fixed Item card smart annotation link [SCI-9583]"
...
This reverts commit 0a3ba6a366
2023-10-24 13:14:23 +02:00
Gregor Lasnibat
0a3ba6a366
Fixed Item card smart annotation link [SCI-9583]
2023-10-22 08:56:51 +02:00
Giga Chubinidze
186eb1cc7e
Report - Well plates columns fix [SCI-9552]
2023-10-20 02:27:06 +04:00
Oleksii Kriuchykhin
ae7995fee2
Merge branch 'develop' into features/inventory-item-card-edit
2023-10-19 12:59:45 +02:00
wandji
c8359cdf3a
Add controller action to update inventory item cell data [SCI-9478] ( #6379 )
2023-10-16 17:43:53 +02:00
Alex Kriuchykhin
80ccd0039c
Apply saved custom columns order to the inventory item card [SCI-9540] ( #6462 )
2023-10-16 16:38:43 +02:00
Andrej
30295a313b
Fix unsharing of repository rows [SCI-9484]
2023-10-09 11:05:33 +02:00
wandji20
0c531fb874
Fix team name in stock export [SCI-9485]
2023-10-06 11:04:33 +01:00
wandji20
d3c2a7e0ad
Fix issue with timestamps for reports [SCI-9420]
2023-10-05 12:25:08 +01:00
wandji20
6358ad2da4
Fix issue with protocol and result text name [SCI-9420]
2023-10-05 08:08:49 +01:00
Alex Kriuchykhin
afb40fd762
Merge pull request #6337 from rekonder/aj_SCI_9427
...
Fix consumption export date format [SCI-9427]
2023-10-04 16:54:08 +02:00
Andrej
301ba6b818
Fix consumption export date format [SCI-9427]
2023-10-04 16:46:19 +02:00
Oleksii Kriuchykhin
421ba27a6f
Merge branch 'release/1.28.0' into develop
2023-10-04 13:19:31 +02:00
wandji20
5f5a170827
Fix counter issue in repository export modal [SCI-9165]
2023-10-03 09:49:57 +01:00
Alex Kriuchykhin
40b6078ab2
Merge pull request #6312 from rekonder/aj_SCI_9386
...
Refactor export stock consumption modal [SCI-9386]
2023-10-03 10:33:00 +02:00
Andrej
835cfb5e07
Refactor export stock consumption modal [SCI-9386]
2023-10-03 09:27:10 +02:00
Martin Artnik
a1df2b7b52
Merge pull request #6314 from G-Chubinidze/gc_SCI_9245_V2
...
DOCX not working if result name empty. [SCI-9245]
2023-09-29 12:24:18 +02:00
Giga Chubinidze
0be8ab5839
used i18n
2023-09-29 14:18:45 +04:00
Giga Chubinidze
07ce65f5e6
DOCX not working if result name empty.
2023-09-29 10:38:27 +04:00
Martin Artnik
c6272afe27
Merge pull request #6264 from ivanscinote/SCI-9247-ensure-team-export-works-with-new-results
...
Ensure team export works with new results [SCI-9247]
2023-09-27 12:46:52 +02:00
Alex Kriuchykhin
9f03d88f12
Merge pull request #6201 from wandji20/wb-SCI-9225
...
Improve UI for stock consumption export [SCI-9225]
2023-09-27 09:21:22 +02:00
wandji20
213c752941
Improve UI for for exports in inventory with stock enabled [SCI-9225]
2023-09-26 15:20:18 +01:00
Oleksii Kriuchykhin
efae35816f
Fix column placement in stock consumption export, add missing localization [SCI-9282]
2023-09-26 13:35:02 +02:00
Anton
bb4349f346
Initial label templates refactor [SCI-9303]
2023-09-25 14:24:22 +02:00
Martin Artnik
3a22d7715d
Merge branch 'develop' into features/september-release
2023-09-25 10:37:40 +02:00
Ivan Kljun
84d3c8a279
Fix team import/export to work with new result [SCI-9247]
2023-09-21 14:23:33 +02:00
Alex Kriuchykhin
378c4c3cab
Merge pull request #6251 from okriuchykhin/ok_SCI_9327
...
Fix rendering of tables with broken metadata in docx reports [SCI-9327]
2023-09-19 14:35:34 +02:00
Oleksii Kriuchykhin
b32f163cdc
Fix rendering of tables with broken metadata in docx reports [SCI-9327]
2023-09-19 14:25:40 +02:00
Martin Artnik
2f4b1ef7b0
Fix report generation with text results [SCI-9211]
2023-09-18 15:01:13 +02:00
Andrej
4c7cd5dd10
Change check if open vector editor is enabled [SCI-9301]
2023-09-18 09:40:16 +02:00
Andrej
9f672ecfe2
Move OVE trial period handling [SCI-9301]
2023-09-15 16:07:10 +02:00
Oleksii Kriuchykhin
4e16d702bd
Fix next page loading for global and task activities [SCI-9175]
2023-09-15 12:34:27 +02:00
Anton
af0fbfeec0
Merge branch 'develop' into features/september-release
2023-09-14 13:45:40 +02:00
Alex Kriuchykhin
d08c2d8bb0
Merge pull request #6101 from okriuchykhin/ok_SCI_9148
...
Hide from annotations projects where user is not assigned [SCI-9148]
2023-09-14 10:57:34 +02:00
Oleksii Kriuchykhin
c649ad26f3
Hide from annotations projects where user is not assigned [SCI-9148]
2023-09-14 10:54:56 +02:00
Giga Chubinidze
bf1a543e94
refactored to result orderable element assoc
2023-09-14 06:25:38 +04:00
Alex Kriuchykhin
40a82f67c0
Merge pull request #6216 from scinote-eln/features/ove-integration
...
Features/ove integration
2023-09-13 17:05:48 +02:00
Giga Chubinidze
a11a879d90
Ensure reports work with new results [SCI-9245]
2023-09-11 12:13:22 +04:00
Alex Kriuchykhin
d8965e8ef9
Refactor old export async methods to ActiveJobs [SCI-9092] ( #6170 )
2023-09-08 11:35:16 +02:00
wandji
a59f94c5a9
Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023] ( #6092 )
...
* Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023]
* Add consumption export modal and improve report generation [SCI-9023]
* Add repository_row association to repository_ledger_records [SCI-9023]
2023-09-07 13:12:27 +02:00
wandji
a25e6fdda3
Add sorting options to experiment task table view [SCI-9120] ( #6102 )
2023-09-06 16:14:17 +02:00
G-Chubinidze
3976e05042
Merge branch 'features/september-release' into gc_SCI_9178
2023-09-06 16:38:25 +04:00
Giga Chubinidze
44cb0db41a
removed object constantization
2023-09-06 16:36:26 +04:00
wandji
d5deb4fa52
Allow non-automatic user_assignments to be updated whe n user role is changed [SCI-9173] ( #6137 )
2023-09-06 11:06:22 +02:00
Giga Chubinidze
5a6202aea2
Unable to create a MarvinJS attachment [SCI-9178]
2023-09-05 18:29:15 +04:00
Oleksii Kriuchykhin
7b40b43922
Merge branch 'release/1.28.0' into develop
2023-09-04 16:01:46 +02:00
Alex Kriuchykhin
df290ad3b3
Improve parameter filtering in activities filters and smart annotations [SCI-9218] ( #6129 )
2023-09-04 15:56:17 +02:00
Ivan Kljun
54a8552901
Fix my_module_results_path and add id to experiments/tablejs tag [SCI-911]
2023-09-04 14:23:55 +02:00
Martin Artnik
3724a4a067
Merge branch 'develop' into features/september-release
2023-09-01 10:30:48 +02:00
Oleksii Kriuchykhin
b4eb4d38e6
Merge branch 'develop' into features/ove-integration
2023-08-31 15:52:38 +02:00
Ivan Kljun
d5066c1a5d
Fix task status color on exp. list view [SCI-9159]
2023-08-29 16:12:00 +02:00
artoscinote
953bd234f4
Merge pull request #6065 from ivanscinote/SCI-9007-update-colors
...
Update 'Not started' status color at reports [SCI-9007]
2023-08-28 09:56:25 +02:00
Ivan Kljun
90199d3590
Add method light_color? to my_module_status [SCI-9007]
2023-08-25 15:47:34 +02:00
Soufiane
e00a8bb7a3
Update logo across Scinote [SCI-8997] ( #6058 )
...
- Update logo in PDF reports
- Update logo in Docx reports
- Update logo in sign-in page
2023-08-24 16:27:33 +02:00
Alex Kriuchykhin
56e411f35e
Add export stock consumption buttons and permission helper [SCI-9022] ( #6040 )
2023-08-24 15:28:28 +02:00
Martin Artnik
0faad52f6c
Merge branch 'hotfix/1.28.0.1' into develop
2023-08-24 12:14:30 +02:00
Ivan Kljun
023a6fe0a8
Update 'Not started' button for reports [SCI-9007]
2023-08-24 08:31:07 +02:00
ajugo
bbe0aa29ea
Fix showing of project folder toolbar buttons [SCI-9099] ( #6053 )
...
* Fix showing of project folder toolbar buttons [SCI-9099]
* Fix reading permission for all projects for team admins [SCI-9099]
* Fix check for team admin [SCI-9099]
2023-08-23 18:05:20 +02:00
artoscinote
9f23fe557a
Add entity breadcrumbs to activity webhooks [SCI-9056] ( #6056 )
2023-08-23 16:49:17 +02:00
Andrej
29cddf5ef7
Merge branch 'develop' into features/ove-integration
2023-08-22 11:00:34 +02:00
