Commit graph

1185 commits

Author SHA1 Message Date
ajugo
1ea7f53e4b
Fix missing toolbar buttons for shared inventories [SCI-8481] (#5481) 2023-05-25 13:46:01 +02:00
G-Chubinidze
3ea85cb2ef
Remove old client_api code [SCI-8144] (#5223)
Remove obsolete client_api code
2023-05-24 12:45:31 +02:00
aignatov-bio
4a3520883b
Merge pull request #5416 from G-Chubinidze/gc_SCI_8299
Implement the bottom action toolbar - inventories [SCI-8299]
2023-05-24 12:06:47 +02:00
Giga Chubinidze
5cd32d5cfa hound fix 2023-05-24 13:48:32 +04:00
Giga Chubinidze
379ef7a9cc moved to develop, fixed pagination style 2023-05-24 11:57:06 +04:00
Giga Chubinidze
d43f10bc6a 'Save PDF to inventory' uppercase word in the button & double modal [SCI-8496] 2023-05-23 22:21:34 +04:00
ajugo
040b3bddce
Add state switch to experiment level for archived experiments [SCI-8503] (#5464) 2023-05-23 15:29:14 +02:00
G-Chubinidze
165aa38247
'Save PDF to inventory' uppercase word in the button & double modal [SCI-8496] (#5445) 2023-05-22 10:37:08 +02:00
Giga Chubinidze
bfc4ebe237 'Save PDF to inventory' uppercase word in the button & double modal [SCI-8496] 2023-05-22 10:55:10 +04:00
Martin Artnik
3499d6c6c5 Fix available actions for archived items [SCI-8489] 2023-05-18 11:46:44 +02:00
Andrej
100eab9cb0 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/plate_templates 2023-05-18 10:56:10 +02:00
artoscinote
cabd6bbed5
Merge pull request #5423 from sboursen-scinote/sb_SCI-8252
Button in the toolbar for assigning items to task from the inventory [SCI-8252]
2023-05-18 09:59:49 +02:00
artoscinote
ef0bf65c19
Merge pull request #5424 from G-Chubinidze/gc_SCI_8302
Implement the bottom action toolbar - reports [SI-8302]
2023-05-18 09:44:53 +02:00
Giga Chubinidze
f161354f1b Implement the bottom action toolbar - reports [SI-8302] 2023-05-18 00:42:16 +04:00
sboursen-scinote
16ccd9703f Implement the assign to task button [SCI-8252] 2023-05-17 16:18:11 +02:00
Martin Artnik
eb5fb16b1b Implement new toolbar for protocols [SCI-8399] 2023-05-17 14:12:40 +02:00
artoscinote
aeb84e18d0
Implement bottom action toolbar for repository items [SCI-8300]
Implement bottom action toolbar for repository items [SCI-8300]
2023-05-17 11:27:55 +02:00
Martin Artnik
503099e331 Added edit buttons, updates to wording [SCI-8301] 2023-05-16 12:27:28 +02:00
Martin Artnik
c8994573fd Add bottom action toolbar to label templates [SCI-8301] 2023-05-16 11:40:07 +02:00
Anton
9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02:00
ajugo
74516da01a
Update reports for plate templates and add headers to docx tables [SCI-8375] (#5373)
Update reports for plate templates and add headers to docx tables [SCI-8375]
2023-05-10 16:15:14 +02:00
Martin Artnik
cf9f86b5d2 Fix project actions, fix edit icons [SCI-8391] 2023-05-04 15:52:46 +02:00
Martin Artnik
7a6fe5050d Fix project folder delete action [SCI-8391] 2023-05-04 14:59:16 +02:00
Martin Artnik
9b875371a4 Implement task table bottom toolbar [SCI-8298] 2023-05-04 11:29:19 +02:00
Martin Artnik
8beb92fc39 Implement new experiments toolbar [SCI-8296] 2023-04-26 15:51:22 +02:00
Martin Artnik
ed04bc6b6a Implement new Projects bottom toolbar [SCI-8295] 2023-04-26 11:25:29 +02:00
ajugo
8eb7d9fa9d
Fix docx report generation for step tables with unknown metadata [SCI-8353] (#5330) 2023-04-21 12:00:02 +02:00
Soufiane
4245807a69
Display the last protocol version when dashboard recent works is clicked [SCI-8266] (#5268) 2023-04-13 11:38:30 +02:00
G-Chubinidze
32217475c7
Revert "Revert "Archived experiments UI improvements [SCI-8086]"" 2023-04-12 11:34:54 +04:00
Oleksii Kriuchykhin
a70d8dea74 Fix TinyMCE issue in project export, small fixes for protocols [SCI-8199] 2023-04-04 13:42:20 +02:00
Oleksii Kriuchykhin
89a45d2b14 Merge branch 'hotfix/1.26.6.4' into develop 2023-03-29 10:39:51 +02:00
Martin Artnik
f48350c6ea Properly handle repository snapshots in reports [SCI-8212] 2023-03-28 10:37:24 +02:00
ajugo
c0977799f3
Fix recent works for protocol [SCI-8204] (#5211) 2023-03-27 16:00:40 +02:00
G-Chubinidze
a1c611ab1e
Revert "Archived experiments UI improvements [SCI-8086]" 2023-03-22 13:21:08 +04:00
Oleksii Kriuchykhin
7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Andrej
8bf9e2425b Fix docx table generator if metadata are nil [SCI-8165] 2023-03-20 14:12:44 +01:00
Andrej
64441f791f Fix check for nil row [SCI-8165] 2023-03-20 11:59:20 +01:00
Andrej
8d7d2a4539 Merge branch 'hotfix/1.26.6.2' of https://github.com/biosistemika/scinote-web into aj_SCI_8165 2023-03-20 11:16:33 +01:00
Andrej
c84adfdecc Fix docx report generation with broken metadate [SCI-8165] 2023-03-20 11:14:27 +01:00
Oleksii Kriuchykhin
b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
Anton
248b6b6581 Remove additional code 2023-03-17 11:11:59 +01:00
Alex Kriuchykhin
d82470aa03
Improve handling and escaping of special characters in input fields [SCI-8125] (#5135) 2023-03-13 18:00:30 +01:00
Giga Chubinidze
3d11400311 Archived experiments UI improvements [SCI-8086] 2023-03-13 15:12:40 +04:00
Giga Chubinidze
4cc953663f Display the ID of the parent protocol in reports [SCI-8081] 2023-03-10 00:08:07 +04:00
artoscinote
e88b84000b
Merge pull request #5021 from artoscinote/ma_SCI_7978
Protocol permission modal changes [SCI-7978]
2023-02-27 13:34:32 +01:00
Alex Kriuchykhin
5de5d64be5
Update external protocol importer backend in order to work with new protocol versioning [SCI-7829] (#5017) 2023-02-27 10:37:51 +01:00
Martin Artnik
89459ae21a Protocol group assignment fixes [SCI-7978] 2023-02-24 17:24:25 +01:00
Martin Artnik
c24b0fa5ab Refactor access modals [SCI-7978] 2023-02-23 14:57:38 +01:00
Soufiane
c88e2df19c
Fix filter_date action when only one date is present [SCI-7942] (#5005)
Fix filter_date action when only one date is present [SCI-7942]
2023-02-21 14:36:24 +01:00
Soufiane
77d4a33829
Fix the undefined method issue for activity subjects [SCI-7942] (#4994) 2023-02-20 11:49:27 +01:00
Alex Kriuchykhin
7f8f723cbe
Fix handling of ISS in Azure configuration, fix linked accounts page [SCI-7923] (#4974) 2023-02-14 16:50:15 +01:00
ajugo
dc8b147282
Add handson table metadata to reports [SCI-7835] (#4956)
* Add handson table metadata to reports [SCI-7835]

* Fix step table loading for empty metadata [SCI-7835]
2023-02-13 11:32:18 +01:00
artoscinote
db75d1cb34
Merge pull request #4938 from sboursen-scinote/sb_SCI-7831
No warning message on modal, when importing existing protocol from protocols.io into My Protocols [SCI-7831]
2023-02-06 16:59:08 +01:00
sboursen-scinote
1614e3e52b Fix hound [SCI-7831] 2023-02-06 16:42:48 +01:00
sboursen-scinote
2fc5772af3 Catch RecordInvalid errors and remove uneeded error_format function [SCI-7831] 2023-02-06 16:36:52 +01:00
sboursen-scinote
93851b8c90 Fix code style issues [SCI-7831] 2023-02-06 13:49:34 +01:00
sboursen-scinote
c39b660fe3 Format error before sending it from back-end [SCI-7831] 2023-02-06 13:29:15 +01:00
artoscinote
2af2479808
Merge pull request #4937 from artoscinote/ma_SCI_6359
Fix multiple route helper incluions [SCI-6359]
2023-02-06 13:08:04 +01:00
Martin Artnik
7c6cca0615 Fix multiple route helper incluions [SCI-6359] 2023-02-06 13:03:12 +01:00
ajugo
5104dab5b4
Show parent id for inventory snapshot items in exported excel [SCI-7671] (#4907) 2023-02-06 11:18:19 +01:00
ajugo
6fcb9152dc
Fix CSS for generated pdf/docx reports [SCI-7660] (#4911)
* Fix CSS for generated pdf/docx reports [SCI-7660]

* Call correct asset previewable function [SCI-7660]
2023-02-01 12:01:18 +01:00
Alex Kriuchykhin
00d99ee296
Fix user assigning to teams with existing team sharing records [SCI-7720] (#4879) 2023-01-24 15:47:53 +01:00
Martin Artnik
0304daef7d Cast rgb() formatted css colors to hex for DOCX [SCI-7796] 2023-01-19 15:50:59 +01:00
Alex Kriuchykhin
1ac86b8188
Merge pull request #4832 from okriuchykhin/ok_SCI_7638
Improve loading speed of inventory table [SCI-7638]
2023-01-18 11:39:52 +01:00
Oleksii Kriuchykhin
e51cf28ec6 Improve loading speed of inventory table [SCI-7638] 2023-01-18 11:10:43 +01:00
Alex Kriuchykhin
f455b8fb32
Merge pull request #4784 from okriuchykhin/ok_SCI_7703
Improve handling of db locks [SCI-7703]
2023-01-18 10:24:52 +01:00
Oleksii Kriuchykhin
3a85cdde0a Improve handling of db locks [SCI-7703] 2023-01-17 17:30:20 +01:00
Alex Kriuchykhin
91d5e9a72c
Merge pull request #4839 from okriuchykhin/team_deletion_fix
Fix team data deletion, add user assignments deletion for PET
2023-01-17 13:24:50 +01:00
ajugo
bf5e0da17a
Fix field codes dropdown for label templates [SCI-7770] (#4837) 2023-01-17 12:50:17 +01:00
Oleksii Kriuchykhin
2d8392f6c0 Fix team data deletion, add user assignments deletion for PET 2023-01-16 15:10:15 +01:00
ajugo
56fb8a4efa
Fix hoover tooltip for company logo [SCI-7766] (#4827) 2023-01-16 10:23:34 +01:00
ajugo
1e01d1f2b7
Fix missing translation for field codes [SCI-7765] (#4826) 2023-01-16 10:21:10 +01:00
Alex Kriuchykhin
d4b0f0da9d
Merge pull request #4819 from scinote-eln/features/label-template-logo
Features/label template logo
2023-01-13 11:58:01 +01:00
ajugo
4b3b88fad8
Fix task access modal for user role [SCI-7712] (#4817) 2023-01-13 11:50:42 +01:00
aignatov-bio
d93268f920
Merge pull request #4808 from aignatov-bio/ai-sci-7744-experiment-table-fix-results-counter
Experiment table fix results counter [SCI-7744]
2023-01-12 13:30:25 +01:00
Anton
2f6312de11 Experiment table fix results counter [SCI-7744] 2023-01-12 13:19:32 +01:00
aignatov-bio
abaf8d9e07
Merge pull request #4806 from aignatov-bio/ai-sci-7746-fix-due-date-ordering
Experiment table improve due date sorting [SCI-7746][SCI-7704]
2023-01-12 12:58:18 +01:00
ajugo
769b5bc815
Fix task access modal for viewer role [SCI-7712] (#4789) 2023-01-12 12:15:29 +01:00
Anton
3dff1b8a8c Experiment table improve due date sorting [SCI-7746][SCI-7704] 2023-01-12 11:57:48 +01:00
ajugo
67dcbb0fa6
Open the correct experiment view [SCI-7662][SCI-7741] (#4798)
* Fix experiment view loading [SCI-7662]

* Fix experiment view loading [SCI-7662]
2023-01-12 11:31:04 +01:00
artoscinote
4ecf208243
Merge pull request #4780 from artoscinote/ma_SCI_7683
Fix task access modal for archived experiments [SCI-7683]
2023-01-10 11:51:47 +01:00
ajugo
1fe39a216c
Fix tag display in experiment table for viewer role [SCI-7696] (#4781) 2023-01-10 11:09:23 +01:00
Martin Artnik
da5324d2a1 Fix task access modal for archived experiments [SCI-7683] 2023-01-09 16:04:57 +01:00
aignatov-bio
29c13d8578
Merge pull request #4769 from aignatov-bio/ai-sci-7695-fix-comments-view-mode-experiment-table
Experiment table - fix comments view mode [SCI-7695]
2023-01-06 13:10:42 +01:00
aignatov-bio
46dfe2aa37
Merge pull request #4767 from aignatov-bio/ai-sci-7693-fix-view-mode-for-experiment-table-assigned-users
Experiment table - fix view mode for assigned users [SCI-7693]
2023-01-06 13:10:23 +01:00
Anton
c513e6bca7 Experiment table - fix comments view mode [SCI-7695] 2023-01-06 12:02:35 +01:00
Anton
802e0e602b Experiment table - fix view moda for assigned users [SCI-7693] 2023-01-06 11:44:48 +01:00
Anton
a98aad56db Fix task id in experiment table [SCI-7690] 2023-01-06 10:58:41 +01:00
ajugo
32e9329bcc
Fix user assign modal in experiment archived table view [SCI-7654] (#4742) 2023-01-05 12:00:12 +01:00
aignatov-bio
eaa7928617
Merge branch 'develop' into ai-sci-7167-update-repository-project-logic 2023-01-04 10:08:38 +01:00
Martin Artnik
1b4c209180 Fix syntax error [SCI-7368] 2022-12-23 15:03:02 +01:00
aignatov-bio
ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
Martin Artnik
45aad7f429 Fix duplicate entries for recent work [SCI-7641] 2022-12-20 14:32:22 +01:00
ajugo
41892e35c6
Fix docx report generator for links in activity [SCI-7598] (#4720) 2022-12-15 10:54:24 +01:00
Oleksii Kriuchykhin
89258ce2ae Improve user team invitation logic [SCI-7577] 2022-12-13 11:34:56 +01:00
Anton
abee54699d Fix label template error handling [SCI-7572] 2022-12-12 15:21:15 +01:00
Alex Kriuchykhin
67e4a7f658
Merge pull request #4706 from okriuchykhin/ok_SCI_7393
Remove underscore escaping for ZPL templates previews [SCI-7393]
2022-12-12 11:00:37 +01:00
Oleksii Kriuchykhin
925d7e5c45 Remove underscore escaping for ZPL templates previews [SCI-7393] 2022-12-12 10:28:35 +01:00
aignatov-bio
d3fee7eee0
Merge pull request #4691 from okriuchykhin/ok_SCI_7551
Add img2zpl gem for ZPL image code generation [SCI-7551]
2022-12-09 14:28:15 +01:00
aignatov-bio
66b0968b66
Merge pull request #4696 from aignatov-bio/ai-sci-7552-add-company-logo-to-label-templates
Add logo to label templates [SCI-7552]
2022-12-09 13:36:27 +01:00
Anton
c5d91b061b Add logo to label templates 2022-12-09 13:33:10 +01:00
Oleksii Kriuchykhin
c35df9a762 Fix search by ID for project cards [SCI-7564] 2022-12-08 21:24:21 +01:00
artoscinote
a3e8000360
Merge branch 'develop' into features/exposed_ids 2022-12-08 15:58:11 +01:00
Oleksii Kriuchykhin
95baaefd7a Add img2zpl gem for ZPL image code generation [SCI-7551] 2022-12-07 11:59:27 +01:00
ajugo
02f039ffed
Implement sorting for experiment table view [SCI-7451] [SCI-7497] (#4659)
* Implement experiment table sort flyout [SCI-7451]

* Implement archive sort options for experiment table [SCI-7497]

* Fix hound [SCI-7451]

* Clean code for experiment table view sorting [SCI-7497]

* Fix hound [SCI-7451]
2022-12-05 10:30:20 +01:00
Martin Artnik
b600ca9771 Properly format Excell dates in import preview [SCI-7192] 2022-12-02 14:17:50 +01:00
aignatov-bio
7f87f850b3
Merge branch 'features/new_experiment_views' into ai-sci-7453-add-restore-task-to-experiment-table-view 2022-12-02 13:37:39 +01:00
ajugo
8ff822c7e5
Implement due date column in experiment table view [SCI-7406] (#4646)
* Implement due date column in experiment table view [SCI-7406]

* Fix due date [SCI-7406]

* Move text to translation [SCI-7406]

* Fix table due date partial [SCI-7406]

* Fix table due date partial [SCI-7406]
2022-12-02 11:01:40 +01:00
artoscinote
eaf9017def
Merge pull request #4643 from artoscinote/ma_SCI_7206
Add exposed IDs to recent work [SCI-7206]
2022-12-02 10:16:51 +01:00
artoscinote
4664ef1d9b
Implement task cloning in experiments table [SCI-7382] (#4653)
* Implement task cloning in experiments table [SCI-7382]

* Fix provisioning status polling [SCI-7382]

* Remove unused method [SCI-7382]

* Fix linter issues [SCI-7382]

* Fix fetching last clone number [SCI-7382]

* Fixing experiment duplication [SCI-7382]

* Add truncation to cloned name [SCI-7382]

* Add readable scope to batch clone action [SCI-7382]

* Move 'Clone' to translations, simplify JS [SCI-7382]
2022-12-01 15:08:59 +01:00
aignatov-bio
bd0ac95307
Merge pull request #4669 from aignatov-bio/ai-sci-7510-finish-user-assignment-modal
Finish user assignment for experiment table [SCI-7510]
2022-12-01 12:59:30 +01:00
G-Chubinidze
2d04357ba8
Merge pull request #4668 from G-Chubinidze/gc_SCI_7494
Archived table view filters update [SCI-7494]
2022-12-01 12:32:41 +04:00
Anton
234c4dfaeb Finish user assignment for experiment table [SCI-7510] 2022-11-30 15:04:02 +01:00
Giga Chubinidze
8e78938b02 Archived table view filters update [SCI-7494] 2022-11-30 16:47:49 +04:00
Anton
bd77433fce Add user assignments dropdown for experiment table [SCI-7440] 2022-11-29 13:42:39 +01:00
Giga Chubinidze
8d97641110 Add IDs to pdf and docx reports [SCI-7200] 2022-11-29 11:38:08 +04:00
Anton
2901c7b627 Add restore action to experiment table [SCI-7453] 2022-11-28 12:45:18 +01:00
Giga Chubinidze
ba0ebfbe29 Update sorting on Projects and Experiments pages [SCI-7175] 2022-11-26 01:18:54 +04:00
Anton
2e2086a03b Add archived view for experiment table [SCI-7452] 2022-11-24 12:07:52 +01:00
Anton
440800537c Add menu to experiment table row [SCI-7446] 2022-11-23 15:05:13 +01:00
Martin Artnik
2959cf6276 Add exposed IDs to recent work [SCI-7206] 2022-11-23 15:03:35 +01:00
Anton
51446b130f Add experiment table manage access [SCI-7385] 2022-11-13 22:33:41 +01:00
Anton
0a87513458 Add edit modal to experiment table [SCI-7383] 2022-11-11 11:24:23 +01:00
Anton
63ce422367 Add basic filters for experiment table [SCI-7215] 2022-11-09 15:27:39 +01:00
Oleksii Kriuchykhin
be7ef8fdc0 Fix team export/import [SCI-7434] 2022-11-08 14:50:16 +01:00
Anton
7ceb94ab1f Add toolbar to experiment table [SCI-7379] 2022-11-08 12:52:49 +01:00
ajugo
dd22d53bda
Implemented pagination for experiment table [SCI-7214] (#4591)
* Implement pagination for experiment table [SCI-7214]

* Fix table experiment pagination [SCI-7214]

* Move pagination to service [SCI-7214]
2022-11-07 11:46:54 +01:00
Anton
bacd3524e8 Add tags manager to experiment table view [SCI-7368] 2022-11-02 15:17:10 +01:00
ajugo
bdf56ea2a1
Add comments to the experiment table view [SCI-7217] (#4583) 2022-10-27 14:41:35 +02:00
ajugo
449283b4f5
Show only active result in experiment table view [SCI-7369] (#4578) 2022-10-27 09:52:20 +02:00
Oleksii Kriuchykhin
c16d0cb7a6 Fix update of shared inventories user assignments [SCI-7360] 2022-10-25 23:26:20 +02:00
Anton
8feaedc0d1 Add core columns to experiment table [SCI-7212] 2022-10-24 15:27:57 +02:00
Oleksii Kriuchykhin
a9e7e81e51 Fix typo in update team assignments service, improve shared inventories migration [SCI-7360] 2022-10-21 14:04:33 +02:00
Anton
bc86f11404 Add experiment table view [SCI-7174] 2022-10-21 12:22:38 +02:00
Oleksii Kriuchykhin
7d3f48199a Fix shared repositories migration, update sharing logic and permissions [SCI-7360] 2022-10-21 11:00:52 +02:00
Oleksii Kriuchykhin
94978ea2ea Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366] 2022-10-20 16:19:02 +02:00
Alex Kriuchykhin
a55390898a
Merge pull request #4553 from okriuchykhin/ok_SCI_7348_v2
Fix protocol permission propagation [SCI-7348]
2022-10-20 09:24:44 +02:00
Oleksii Kriuchykhin
5ba6fe08d6 Fix protocol permission propagation [SCI-7348] 2022-10-19 17:26:13 +02:00
ajugo
9639e30c72
Generate correct format for create at at print time [SCI-7351] (#4547) 2022-10-19 13:18:52 +02:00
ajugo
98c32fda78
Fix label preview for custom repository columns [SCI-7358] (#4549) 2022-10-19 13:18:33 +02:00
ajugo
fab625d819
Set correct permission for repository on team role change [SCI-7341] (#4540) 2022-10-18 10:43:51 +02:00
Alex Kriuchykhin
63a1b35a45
Merge pull request #4529 from okriuchykhin/ok_SCI_6943_v2
Unify tags loading order [SCI-6943]
2022-10-17 10:21:13 +02:00
Oleksii Kriuchykhin
e43aa30193 Unify tags loading order [SCI-6943] 2022-10-13 13:55:36 +02:00
Oleksii Kriuchykhin
1bd3a7e783 Fix protocol import in templates [SCI-7325] 2022-10-12 14:27:21 +02:00
Martin Artnik
b67bea81b8 Remove legacy protocol links [SCI-7323] 2022-10-12 11:01:16 +02:00
Oleksii Kriuchykhin
9322052f9d Add logic for user role updates for team child objects [SCI-7292] 2022-10-10 15:27:42 +02:00
ajugo
f87b42d042
Remove icon from the status repository column at label print time [SCI-7267] (#4471)
* Remove icon from the status repository column at label print time [SCI-7267]

* Fix status repository column at label print time [SCI-7267]

* Fix status repository column at label print time [SCI-7267]
2022-10-06 11:53:12 +02:00
ajugo
aa10259d40
Fix loading of zebra printers to modal and some other small fixes [SCI-7244] (#4463)
* Fix loading of zebra printers to modal and some other small fixes [SCI-7244]

* Fix zebra printing [SCI-7244]
2022-09-27 09:58:22 +02:00
Anton
dbfc3b2e2a Fix column label template format [SCI-7236] 2022-09-26 21:01:31 +02:00
Alex Kriuchykhin
fcd235b654
Merge pull request #4457 from okriuchykhin/ok_SCI_7241
Improve error handling in label template preview generation [SCI-7241]
2022-09-26 10:33:30 +02:00
ajugo
8c2f7da87f
Escape underscores when sending ZPL to render service [SCI-7223] (#4456) 2022-09-26 10:21:12 +02:00
Oleksii Kriuchykhin
1d7bca0664 Improve error handling in label template preview generation [SCI-7241] 2022-09-22 15:24:30 +02:00
ajugo
a3ea6e608c
Add validation to print modal and implement zpl printing [SCI-7052][SCI-7221] (#4448)
* Add validation to print modal [SCI-7052]

* Fix dropdown on label modal print [SCI-7052]

* Fix hound [SCI-7052]

* Rename validation endpoint [SCI-7052]

* Add zpl label printing and fix fluics printing [SCI-7221]

* Fix hound [SCI-7221]
2022-09-22 15:06:36 +02:00
aignatov-bio
7d23f3c8a6
Merge branch 'develop' into ai-sci-7089-include-label-templates-to-team-import-export 2022-09-15 11:20:20 +02:00
Anton
0c596bb701 Merge branch 'develop' into features/label-templates 2022-09-15 10:40:17 +02:00
aignatov-bio
4182194b31
Merge branch 'features/label-templates' into features/team-permissions 2022-09-14 14:34:02 +02:00
aignatov-bio
9e63dcab22
Merge pull request #4207 from okriuchykhin/ok_SCI_6918
Update repository sharing actions [SCI-6918]
2022-09-14 14:23:52 +02:00
Anton
75a15310ac Merge branch 'features/team-permissions' into features/label-templates 2022-09-13 14:26:15 +02:00
Anton
7d02b9f26d Fix repository selection in reports [SCI-7167] 2022-09-13 09:59:11 +02:00
artoscinote
6a2037dc00
Fix smart annotations in locked elements [SCI-7135] (#4421) 2022-09-09 11:15:33 +02:00
artoscinote
27b4f398a4
Merge pull request #4404 from G-Chubinidze/gc_SCI_7161
Fix underline in docx report generator [SCI-7161]
2022-09-02 15:13:13 +02:00
Giga Chubinidze
f8842cd066 Fix underline in docx report generator [SCI-7161] 2022-09-02 17:11:36 +04:00
Giga Chubinidze
85873213b8 Fix underline in docx report generator [SCI-7161] 2022-09-02 16:44:51 +04:00
artoscinote
87e944c9c4
Merge pull request #4400 from G-Chubinidze/gc_SCI_7141
Fix superscript and subscript  in docx report generator [SCI-7141]
2022-09-01 11:34:08 +02:00
Giga Chubinidze
57c5947d91 Fix superscript and subscript in docx report generator [SCI-7141] 2022-09-01 10:49:17 +04:00
Giga Chubinidze
922652417a Fix superscript and subscript in docx report generator [SCI-7141] 2022-09-01 10:15:31 +04:00
Oleksii Kriuchykhin
ba54f42d2f Wrap unsaring actions in transaction [SCI-6918] 2022-08-31 17:21:01 +02:00
Oleksii Kriuchykhin
bf8f838214 Update repository sharing actions [SCI-6918] 2022-08-31 17:21:01 +02:00
Oleksii Kriuchykhin
eb04bc974d Update tests with new team user assignments [SCI-6843] 2022-08-31 16:37:00 +02:00
Anton
bcc681b14d Add labels template to team import/export [SCI-7089] 2022-08-31 10:28:29 +02:00
Martin Artnik
6b25759715 Fix import issues with date formatting [SCI-7111] 2022-08-31 09:06:16 +02:00
Oleksii Kriuchykhin
b2b059b7e1 Add syncing service and schedule for Fluics templates sync [SCI-7047] 2022-08-29 09:59:13 +02:00
Alex Kriuchykhin
dac492cfd4
Merge pull request #4353 from okriuchykhin/ok_SCI_7045
Add list label templates method to Fluics API client [SCI-7045]
2022-08-25 13:40:40 +02:00
aignatov-bio
6d8908c1f5
Merge branch 'features/label-templates' into ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor 2022-08-24 17:48:48 +02:00
artoscinote
7a7df03396
Implement label preview component [SCI-7050] (#4370) 2022-08-24 13:55:54 +02:00
Anton
4f312bf329 Finalize insert field dropdown [SCI-7054] 2022-08-17 12:58:27 +02:00
Anton
174d33bba8 Add column dropdown to label template editor [SCI-7054] 2022-08-16 10:16:40 +02:00
Oleksii Kriuchykhin
08e654d5fb Add list label templates method to Fluics API client [SCI-7045] 2022-08-12 19:47:29 +02:00
Oleksii Kriuchykhin
f02f625e1e Add client for ZPL preview generation service [SCI-7049] 2022-08-12 12:57:19 +02:00
ajugo
2c3ddcbb93
Add tinymce image to imported protocol [SCI-7076] (#4345) 2022-08-11 10:00:14 +02:00
artoscinote
4e768bec04
Add endpoint for fetching label template tags [SCI-7053] (#4319) 2022-08-10 11:35:38 +02:00
aignatov-bio
b4e7877b99
Merge pull request #4328 from aignatov-bio/ai-sci-7077-fix-report-protocol-name-issue
Fix protocol name in report [SCI-7077][SCI-7078]
2022-08-10 10:06:05 +02:00
Anton
147127a739 Fix protocol name in report [SCI-7077][SCI-7078] 2022-08-09 13:50:00 +02:00
artoscinote
c106c2d997
Add active reminders filter [SCI-7004] (#4280) 2022-08-09 10:23:40 +02:00
artoscinote
eb619184a5
Implement typed label templates [SCI-7046] (#4316)
* Implement typed label templates [SCI-7046]

* Add structure.sql, fix migration [SCI-7046]

* Fix method name [SCI-7046]

* Add dependent option to team - label_template relation [SCI-7046]

* Migration code style, add input sanitization [SCI-7046]

* Fix new label creation [SCI-7046]
2022-08-08 10:06:00 +02:00
ajugo
74a688e8ae
Fix protocol title and archived result tag [SCI-6979] (#4303) 2022-08-02 10:06:00 +02:00
ajugo
1732c8897a
Docx report fixes [SCI-6979] (#4265)
* Fixes for docx [SCI-6979]

* Remove step description from DOCX [SCI-6979]
2022-07-20 10:12:38 +02:00
Alex Kriuchykhin
0a8acb36f8
Merge pull request #4231 from okriuchykhin/ok_SCI_6974
Fix display of stock consumption in assigned items table [SCI-6974]
2022-07-14 09:47:57 +02:00
artoscinote
3d2e835268
DOCX layout improvements [SCI-6857] (#4160) 2022-07-13 12:52:56 +02:00
Oleksii Kriuchykhin
d3a8b3ca59 Fix display of stock consumption in assigned items table [SCI-6974] 2022-07-12 16:53:07 +02:00
Alex Kriuchykhin
26820b9abb
Fix subject references for repository row activities [SCI-6906] (#4203) 2022-07-07 12:00:35 +02:00
ajugo
454c1f01d0
Switch to fluics api v3 [SCI-6859] (#4201) 2022-07-06 13:02:48 +02:00
artoscinote
e38fbf4b10
Add join alias for consistent assigned my modules count [SCI-6942] (#4197) 2022-07-06 11:53:26 +02:00
ajugo
8e7307c5c1
Project json exporter adaptions for step improvements [SCI-6898] (#4177)
* Adapt project export to step improvements [SCI-6898]

* Add tests [SCI-6898]
2022-07-06 11:45:50 +02:00
Martin Artnik
910c36af08 Merge branch 'features/step-editing-improvements' into develop 2022-07-05 10:12:10 +02:00
ajugo
a4ff347d6e
Fix datatable sort in task assigned repository to task and on first repository load [SCI-6904] (#4164)
* Enable repository sorting on assigned repository [SCI-6904]

* Fix order at repository table initialization [SCI-6904]
2022-06-21 10:49:03 +02:00
Alex Kriuchykhin
49f05f3df9
Merge pull request #4162 from okriuchykhin/ok_SCI_6907
Fix repository export with enabled stock management [SCI-6907]
2022-06-13 10:14:53 +02:00
Oleksii Kriuchykhin
10f7460648 Fix repository export with enabled stock management [SCI-6907] 2022-06-10 15:46:22 +02:00
artoscinote
e114f9b880
Update protocols.io importer and import from repository [SCI-6872] (#4138) 2022-06-08 15:55:50 +02:00
Anton
fb9fcb9371 Update team import/export scripts [SCI-6875] 2022-06-08 15:32:59 +02:00