Commit graph

1940 commits

Author SHA1 Message Date
artoscinote
a76bc912b1
Merge pull request #5887 from G-Chubinidze/gc_SCI_8849
CSS - mixed issues [SCI-8849]
2023-08-01 10:32:02 +02:00
artoscinote
f117c21ea5
Merge pull request #5873 from aignatov-bio/ai-sci-8905-refactor-insert-menu
Refactor insert menu [SCI-8905]
2023-08-01 10:13:23 +02:00
Giga Chubinidze
4cd1f59d7b CSS - mixed issues [SCI-8849] 2023-07-31 08:47:43 +04:00
Anton
2b83243aa8 Refactor insert menu [SCI-8905] 2023-07-26 16:28:32 +02:00
Martin Artnik
3978d9efef Merge branch 'develop' into features/august-release 2023-07-26 11:22:49 +02:00
Anton
f4d8983040 Update attachments section [SCI-8879] 2023-07-25 15:10:09 +02:00
Ivan Kljun
18fb319351 Drop system notifications tables and remove logic 2023-07-25 14:48:03 +02:00
Oleksii Kriuchykhin
de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +02:00
wandji
54877c2c1c
Fix UI issues in addons page [SCI-8896] (#5835)
* Fix UI issues in addons page [SCI-8896]

* Fix linter error [SCI-8896]
2023-07-21 14:08:06 +02:00
Andrej
f493ec0da1 Merge branch 'develop' into features/shareable-links 2023-07-19 12:57:20 +02:00
Martin Artnik
5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
wandji
aafeb456fa
Fix CSS issues in experiments tasks page and modal [SCI-8766] (#5738)
* Fix CSS issues in experiments tasks page and modal [SCI-8766]

* Fix linter errors [SCI-8766]

* Increase spacing for icons in ask display modal and remove html.erb extention from render partial

* Optimize changes [SCI-8766]
2023-07-18 13:38:50 +02:00
aignatov-bio
b18421ec4b
Merge pull request #5762 from aignatov-bio/ai-sci-8735-add-error-modal-for-protocol-parsing
Added error handling for protocol import [SCI-8735]
2023-07-18 10:21:11 +02:00
wandji
2698681548
Fix Not correct naming for label in global activity filter (#5776)
* Update translation for label_repository and sort template label names in label print modal

* Rename label_repository to label_templates in translation file and initializer/extends) [SCI-8808]
2023-07-17 15:38:28 +02:00
Oleksii Kriuchykhin
a95aab85e2 Merge branch 'develop' into features/shareable-links 2023-07-13 15:04:27 +02:00
Oleksii Kriuchykhin
092e451f2e Merge branch 'develop' into features/protocol-parsing 2023-07-13 13:59:10 +02:00
Anton
25b11bfb24 Added error handling for protocol import [SCI-8735] 2023-07-13 11:51:35 +02:00
Soufiane
78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
ajugo
32fc7698d2
Implement welcome modal for shareable links [SCI-8748] (#5729) 2023-07-11 16:01:42 +02:00
artoscinote
4a8582ebc8
Initial implementation of protocol processing modal [SCI-8661] (#5683)
* Initial implementation of protocol processing modal [SCI-8661]

* Prepare placeholder jobs and integrate notifications [SCI-8661]
2023-07-11 09:27:15 +02:00
ivanscinote
40dc7f988d
Unify search bar placeholder [SCI-8809] (#5749) 2023-07-10 16:25:41 +02:00
Giga Chubinidze
11e1d3ef81 Wrong smart annotation placeholder text at empty inventory [SCI-8514] 2023-07-07 06:26:28 +04:00
ajugo
6c6fc404d2
Implement task shareable modal [SCI-8651] (#5723)
* Implement task shareable modal [SCI-8651]

* Fix routes [SCI-8651]

* Clean code for vue share button initilization [SCI-8651]
2023-07-06 16:05:03 +02:00
Soufiane
6049c7d8b9
Activities for shareable links [SCI-8652] (#5694)
Define new activities for task shareable links [SCI-8652]
2023-07-06 15:01:32 +02:00
Soufiane
94ead579e6
Create the general layout for shareable links [SCI-8749] (#5699) 2023-07-06 09:19:29 +02:00
Soufiane
9d70d35491
Implement share button on task [SCI-8650] (#5691)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-29 13:38:59 +02:00
ajugo
563605e6ef
Implement share task toggle on settings page [SCI-8647] (#5686) 2023-06-28 11:47:41 +02:00
Giga Chubinidze
a2aab6cbeb Parsing (import) protocols - Notifications update [SCI-8693] 2023-06-28 09:05:11 +04:00
Soufiane
fdc4f4ddd7
Create an export_limit_exceeded model for repositories export [SCI-8730] (#5667)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-23 12:10:58 +02:00
ajugo
e2f25eb6c0
Fix export inventory flash message [SCI-8445] (#5666) 2023-06-23 11:12:50 +02:00
G-Chubinidze
6e4d5db975
Merge branch 'develop' into gc_SCI_8645 2023-06-23 11:34:10 +04:00
Giga Chubinidze
b788a2f88a removed data tooltip 2023-06-23 10:49:37 +04:00
Anton
8fac4c1b7c UI CSS fixes 2023-06-22 11:55:23 +02:00
G-Chubinidze
d686d746cb
updated breadcrumb logic for templates (#5609) 2023-06-21 10:27:21 +02:00
G-Chubinidze
a88adf7630
changed tooltips (#5639) 2023-06-21 10:00:46 +02:00
Giga Chubinidze
8fb56f552d changed tooltips 2023-06-21 11:55:09 +04:00
Soufiane
72266fc636
Inventory export FE [SCI-6546] (#5622)
* Implement the front-end part of inventory export functionality [SCI-6546]

- Add the export button to the action toolbar
- Create new modal and link it to the export repository action
- Update the global export limit counter

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Remove load_repository and check_view_permission for export_repositories [SCI-6546]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix text grammar in repositories export modal [SCI-6546]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Use I18n pluralization [SCI-6546]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-19 14:16:55 +02:00
sboursen-scinote
ef16771f00 Add breadcrumbs to Fluics page [SCI-8675]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-19 12:20:53 +02:00
G-Chubinidze
7c55585e1f
Merge branch 'develop' into gc_SCI_8645 2023-06-19 10:18:27 +04:00
Giga Chubinidze
96ff988c77 Buttons title (tooltip on hover) - top action toolbar [SCI-8645] 2023-06-19 10:04:58 +04:00
Soufiane
966b92e8d2
Activities update for grant project access to all team members [SCI-8383] (#5598)
* Create new activities for granting/revoking access to all team members on projects [SCI-8383]
2023-06-16 13:08:02 +02:00
Soufiane
b254f5614b
Inventory export FE [SCI-6546] (#5608)
* Implement the front-end part of inventory export functionality [SCI-6546]

- Add the export button to the action toolbar
- Create new modal and link it to the export repository action
- Update the global export limit counter

* Remove load_repository and check_view_permission for export_repositories [SCI-6546]
2023-06-16 10:48:39 +02:00
ajugo
89f1efc64e
Update shared status in inventory datatable [SCI-8655] (#5604) 2023-06-15 15:32:01 +02:00
Giga Chubinidze
69c7176976 Buttons title (tooltip on hover) - top navigation [SCI-8630] 2023-06-15 04:59:34 +04:00
Anton
d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +02:00
G-Chubinidze
0ad1540a41
Merge branch 'features/ui-revamp' into gc_SCI_8511 2023-06-14 17:02:18 +04:00
Giga Chubinidze
88df4b2a11 Settings page - breadcrumbs [SCI-8511] 2023-06-14 05:13:33 +04:00
Soufiane
23e248ca02
Changed wording for activities [SCI-8243] (#5356)
* Change wording for access activities in projects and protocols [SCI-8243]
* Add project activity for changing all team members role via project option-edit [SCI-8243]
2023-06-13 16:55:40 +02:00
artoscinote
820bf7808a
Merge pull request #5586 from G-Chubinidze/gc_SCI_8476
Breadcrumbs on label/protocol template page [SCI-8476]
2023-06-13 14:49:14 +02:00
G-Chubinidze
9315190ffe
Merge branch 'develop' into gc_SCI_8406 2023-06-13 12:13:22 +04:00
Giga Chubinidze
673718f1db Breadcrumbs on label/protocol template page [SCI-8476] 2023-06-13 11:25:14 +04:00
sboursen-scinote
43bf1cf0eb Add loading state to select_search [SCI-8545]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-12 10:49:31 +02:00
Giga Chubinidze
a777fd5584 New icons implementation [SCI-8366] 2023-06-08 10:33:37 +04:00
Giga Chubinidze
a27c2b2cd3 (A) label (instead of icons) in front of titles of archived elements 2023-06-02 04:03:41 +04:00
artoscinote
6699533301
Merge pull request #5520 from G-Chubinidze/gc_SCI_8385
Empty screen revamp [sci-8385]
2023-05-31 16:35:11 +02:00
Alex Kriuchykhin
2efab1c3b6
Update placeholder text for empty projects [SCI-8580] (#5526) 2023-05-31 13:12:47 +02:00
Giga Chubinidze
68a0be9218 changed empty screen title 2023-05-31 02:09:21 +04:00
artoscinote
98a27b083a
Merge pull request #5344 from sboursen-scinote/sb_SCI-8347
FIle/step dropdown is out of task border [SCI-8347]
2023-05-30 13:46:10 +02:00
artoscinote
01b54763a2
Merge pull request #5477 from G-Chubinidze/gc_SCI_8464
CSS: inventory items top toolbar issues [SCI-8464]
2023-05-29 11:32:16 +02:00
Martin Artnik
a5fe01a07a Add 'no actions' message to action toolbar [SCI-8525] 2023-05-29 09:33:18 +02:00
Soufiane
1a689c9329
Add no-options placehoder to experiments dropdown [SCI-8517] (#5495)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-26 21:10:53 +02:00
Soufiane
e5dc1f365b
Add a no-options placeholder for projects selector [SCI-8544] (#5492)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-26 11:47:35 +02:00
G-Chubinidze
2e21e286b7
Merge branch 'develop' into gc_SCI_8464 2023-05-25 15:32:00 +04:00
Giga Chubinidze
9d9b454dc4 CSS: inventory items top toolbar issues [SCI-8464] 2023-05-25 11:18:47 +04:00
Andrej
9164534548 Add empty states for PET [SCI-8490] 2023-05-24 18:15:41 +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
Soufiane
f21dc998b9
Add filtering for project/experiment filter for assignable tasks [SCI-8442] (#5441)
* Remove object without  edit permission in P/E/T filters [SCI-8442]

* Leave only experiments and projects with active tasks [SCI-8442]
2023-05-24 10:47:27 +02:00
sboursen-scinote
1f83679e5e Merge branch 'develop' into sb_SCI-8347
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-23 23:08:20 +02:00
aignatov-bio
09501c9472
Merge pull request #5443 from sboursen-scinote/sb_SCI-8461
Fix label case elements [SCI-8461]
2023-05-23 10:39:49 +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
sboursen-scinote
f35d4f304c Fix capitalisation typos in translations [SCI-8461] 2023-05-19 14:38:58 +02:00
Alex Kriuchykhin
1a430a77fd
Add filtering option for active/archived PET listing API endpoints, add linked tasks to protocol serializer [SCI-7091] (#4381) 2023-05-19 11:34:31 +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
Soufiane
adaa2b6a48
Extend flash messages for direct task items assignment [SCI-8443] (#5414)
Update item assigment modal flash messages [SCI-8443]
2023-05-17 16:17:19 +02:00
Martin Artnik
eb5fb16b1b Implement new toolbar for protocols [SCI-8399] 2023-05-17 14:12:40 +02:00
Alex Kriuchykhin
5a06f649d6
Merge pull request #5417 from scinote-eln/features/sa-item-assigning
Features/sa item assigning
2023-05-17 11:45:13 +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
Andrej
32d8fc3e0c Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning 2023-05-16 14:26:12 +02:00
G-Chubinidze
49454fd8c8
Merge branch 'develop' into gc_SCI_8305 2023-05-16 16:19:46 +04:00
Martin Artnik
503099e331 Added edit buttons, updates to wording [SCI-8301] 2023-05-16 12:27:28 +02:00
artoscinote
1d30389298
Merge pull request #5407 from G-Chubinidze/gc_SCI_8441
CSS: Smaller visual bugs; Inventory & Tasks [SCI-8441]
2023-05-16 10:38:04 +02:00
ajugo
31b42dc875
Add metadata to table API endpoints [SCI-8376] (#5388) 2023-05-16 10:26:09 +02:00
Anton
9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02:00
Giga Chubinidze
dee32d8986 CSS: Smaller visual bugs; Inventory & Tasks [SCI-8441] 2023-05-16 11:22:46 +04:00
Giga Chubinidze
405897c564 updated code to fit new state dropdown logic + updated card view 2023-05-15 11:12:07 +04:00
aignatov-bio
3b7c3a6f5b
Merge pull request #5390 from artoscinote/ma_SCI_8369
Label templates to toolbar copy [SCI-8369]
2023-05-11 11:30:31 +02:00
aignatov-bio
168fa0a4bc
Merge pull request #5394 from aignatov-bio/ai-sci-8283-add-barcode-search-field
Add barcode search field [SCI-8283]
2023-05-11 11:26:48 +02:00
artoscinote
566b302ce1
Merge pull request #5378 from artoscinote/ma_SCI_8324
Fix main navigation issues [SCI-8324]
2023-05-11 11:26:30 +02:00
Anton
8f5560b016 Add barcode search field [SCI-8283] 2023-05-11 11:21:50 +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
33e9057fef Label templates to toolbar copy [SCI-8369] 2023-05-10 15:18:51 +02:00
aignatov-bio
4737a2d4bc
Merge pull request #5382 from aignatov-bio/ai-sci-8386-refactor-protocol-toolbar
Update protocol top toolbar [SCI-8386]
2023-05-10 11:39:38 +02:00
G-Chubinidze
8f657710ad
Merge pull request #5385 from G-Chubinidze/gc_SCI_8303
create folder name change [SCI-8303]
2023-05-09 17:44:54 +04:00
Giga Chubinidze
b2fa631888 create folder name change 2023-05-09 17:43:32 +04:00
Anton
5ec202e2c4 Update protocol top toolbar [SCI-8386] 2023-05-09 14:59:43 +02:00
artoscinote
09c4100115
Merge pull request #5374 from artoscinote/ma_SCI_8393
Project dropdown menu fixes [SCI-8393]
2023-05-09 12:43:29 +02:00
G-Chubinidze
82d0657593
Merge branch 'features/navigation-refactor-v2' into gc_SCI_8389 2023-05-09 13:41:51 +04:00
aignatov-bio
a19def15f3
Merge pull request #5357 from G-Chubinidze/gc_SCI_8306
Revamp of (top) toolbar + search field - inventories and items [SCI-8306] [SCI-8307]
2023-05-09 11:18:05 +02:00
Giga Chubinidze
a462765cdb code cleanup 2023-05-09 00:06:37 +04:00
Martin Artnik
1af7015e8b Fix main navigation issues [SCI-8324] 2023-05-08 14:44:50 +02:00
ajugo
783d5d03ab
Add edit button to label templates and fix last updated by [SCI-8373] (#5376) 2023-05-08 11:27:29 +02:00
Martin Artnik
cd7b365613 Project dropdown menu fixes [SCI-8393] 2023-05-05 15:47:53 +02:00
sboursen-scinote
443cd21090 WIP: Create a modal for inventory item assignment from inventory page [SCI-8250] 2023-05-05 08:44:40 +02:00
Andrej
29a9c3781e Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning 2023-05-04 13:34:45 +02:00
Martin Artnik
9b875371a4 Implement task table bottom toolbar [SCI-8298] 2023-05-04 11:29:19 +02:00
Giga Chubinidze
efa0ae9534 Revamp of (top) toolbar - items [SCI-8307] 2023-05-03 23:25:13 +04:00
artoscinote
7aeb1c6adf
Merge pull request #5341 from artoscinote/ma_SCI_8249
Implement basic select/search-select components in vue [SCI-8249]
2023-05-03 12:37:47 +02:00
Martin Artnik
863054b044 Implement basic select/search-select components in vue [SCI-8249] 2023-05-03 12:37:14 +02:00
Soufiane
58782131a8
Flash message for delete draft [SCI-8245] (#5300)
Add redirect flash message after draft delete and before the location redirect [SCI-8245]
2023-05-03 11:16:59 +02:00
Soufiane
df0995d867
Move button for archived task in card view [SCI-8253] (#5322)
Implemet the Move task functionality for archived tasks cards view [SCI-8253]
2023-05-03 11:15:17 +02:00
Soufiane
314c7cbfd9
Add object IDs to smart annotation search and global search [SCI-8085] (#5151)
Add object codes to global search [SCI-8085]
2023-05-03 11:07:18 +02:00
Soufiane
32c483316f
Enable searching by ID when smart annotating [SCI-7944] (#5055)
Add objects search by ID in smart annotations [SCI-7944]
2023-05-03 11:05:29 +02:00
Martin Artnik
8beb92fc39 Implement new experiments toolbar [SCI-8296] 2023-04-26 15:51:22 +02:00
Soufiane
342b581259
Replace the table header comment icon with text [SCI-8342] (#5332) 2023-04-25 15:38:10 +02:00
ajugo
d4abcb4980
Implement assigning items to task when adding a smart annotation [SCI-8208] (#5295) 2023-04-25 15:12:19 +02:00
aignatov-bio
af9219b7ae
Assign item through repository item modal [SCI-8141] (#5237) 2023-04-25 14:30:14 +02:00
Soufiane
f94d9cc0f2
Direct inventory item assignment to the current task from the item card BE [SCI-8142] (#5163)
Implement controller action to directly assign item to task [SCI-8142]
2023-04-25 14:00:55 +02:00
sboursen-scinote
a1ff64e3f2 Fix missing translation in my_module archived results [SCI-8347] 2023-04-24 16:42:49 +02:00
Giga Chubinidze
5c690c25f6 button wording changes, hound fixes 2023-04-24 16:14:50 +04:00
G-Chubinidze
c6ab7176b8
Merge pull request #5329 from G-Chubinidze/gc_SCI_8293
Implement active/archive and view dropdowns (toolbar) [SCI-8293]
2023-04-20 15:41:45 +04:00
Giga Chubinidze
a25e361e4f Implement active/archive and view dropdowns (toolbar) [SCI-8293] 2023-04-20 15:40:38 +04:00
Anton
7143c3ed5d Add general layout for navigator [SCI-8046
]
2023-04-19 14:19:55 +02:00
Anton
e8b952f4fd Revert "Revert "Improve breadcrumbs implementation [SCI-8087]""
This reverts commit 78d41d10a6.
2023-04-19 10:53:39 +02:00
aignatov-bio
d7e8f0303f
Merge branch 'features/navigation-refactor-v2' into ai-sci-8016-left-navigation-refactor 2023-04-19 10:33:09 +02:00
G-Chubinidze
5eacd41ca5
Adding well plate table options to "insert step content" select menu [SCI-7931] (#5302)
* well plate implementation without nested dropdown

* Implement dropdown submenu [SCI-7931]

* minor code cleanup

---------

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
Co-authored-by: Martin Artnik <martin@scinote.net>
2023-04-18 15:42:53 +02:00
aignatov-bio
134e7373c7
Merge pull request #5280 from sboursen-scinote/sb_SCI-8237-alternative-solution
Title for publishing template protocol draft must include next version value (Alt) [SCI-8237]
2023-04-14 10:37:51 +02:00
ajugo
e85f1f8bbd
Show error message for protocols templates with same name [SCI-8247] (#5266) 2023-04-13 15:34:36 +02:00
aignatov-bio
9466b119a1
Merge pull request #5297 from scinote-eln/features/navigation-refactor
Features/navigation refactor
2023-04-13 13:59:25 +02:00
artoscinote
447f9dc993
Merge pull request #5245 from G-Chubinidze/gc_SCI_8205
Wrong wording for access button [SCI-8205]
2023-04-12 14:40:55 +02:00
aignatov-bio
78d41d10a6
Revert "Improve breadcrumbs implementation [SCI-8087]" 2023-04-12 14:04:20 +02:00
artoscinote
fa64c8bb5c
Merge pull request #5283 from sboursen-scinote/sb_SCI-8223
CSS: Protocol template list of smaller issues [SCI-8223]
2023-04-12 12:58:25 +02:00
sboursen-scinote
b1914468c9 Add version number to protocol details [SCI-8237] 2023-04-11 15:00:21 +02:00
artoscinote
b3275feedb
Merge pull request #5276 from G-Chubinidze/gc_SCI_7633_v2
updated device table stylings
2023-04-11 10:18:59 +02:00
artoscinote
8a7667432c
Merge pull request #5234 from G-Chubinidze/gc_SCI_8211
Label '(Draft)' in front of the protocol template name [SCI-8211]
2023-04-11 10:14:17 +02:00
Giga Chubinidze
1d44eea8cf updated device table stylings 2023-04-10 23:57:43 +04:00
sboursen-scinote
b66960f41b Fix load protocol template header wording [SCI-8223] 2023-04-07 17:42:00 +02:00
Giga Chubinidze
ceba49acb4 grant access new name, padding update on publish modal 2023-04-06 17:12:56 +04:00
ajugo
3ad1d384ee
Raise character limit for rich text fields and reword limit text error [SCI-7959] (#5221) 2023-04-05 15:34:48 +02:00
Soufiane
4985c2eb88
Added Published on & Published by to Protocol details screen [SCI-8193] (#5239)
Added Published on & Published by to Protocol details screen [SCI-8193]
2023-04-05 15:08:31 +02:00
Soufiane
1a1956e163
Change wording for access management to cover project and templates (EDIT 2) [SCI-8231] (#5251)
* Use I18n [SCI-8231]

* Consolidate the message translations [SCI-8231]
2023-04-04 11:55:00 +02:00
ajugo
91c32e415f
Add missing translation for flash [SCI-8238] (#5243) 2023-04-03 14:37:48 +02:00
Anton
52aac69488 Add final version for left menu [SCI-8016] 2023-04-03 13:29:24 +02:00
sboursen-scinote
8ae354b180 Merge branch 'features/navigation-refactor' into sb_SCI-8087 2023-04-02 17:33:23 +02:00
Anton
0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
sboursen-scinote
852108df0b Change flash messages for protocol access permission [SCI-8231] 2023-03-31 18:45:32 +02:00
Giga Chubinidze
3fc2afde3c Label '(Draft)' in front of the protocol template name [SCI-8211] 2023-03-31 18:30:26 +04:00
sboursen-scinote
95797ab8dd Implement layout breadcrumbs for Inventories [SCI-8087] 2023-03-30 18:42:27 +02:00
Giga Chubinidze
57d951a690 Change title for publishing draft [SCI-8232] 2023-03-30 20:30:49 +04:00
ajugo
e1cf9775fd
Add new activites for all team members [SCI-8224] (#5227) 2023-03-30 16:04:57 +02:00
Martin Artnik
1f5fa19d80 Add missing translation [SCI-8131] 2023-03-27 15:26:59 +02:00
ajugo
26879f200d
Fix CSS for protocol versioning modal [SCI-8194] (#5197) 2023-03-27 13:28:00 +02:00
Anton
1177eaae5b Add general notifiacitons flyout [SCI-8017] 2023-03-25 17:34:26 +01:00
aignatov-bio
d8083b84b6
Merge pull request #5184 from aignatov-bio/ai-sci-8185-css-fixes
Fix tables css [SCI-8185]
2023-03-24 13:14:38 +01:00
aignatov-bio
09a217baca
Merge pull request #5193 from aignatov-bio/ai-sci-8190-fix-protocol-screen-css
Protocol screen css fixes [SCI-8190]
2023-03-24 13:04:00 +01:00
Anton
0b560f5b05 Protocol screen css fixes [SCI-8190] 2023-03-24 12:01:47 +01:00
artoscinote
00191e41de
Merge pull request #5192 from scinote-eln/features/token-revocation
Features/token revocation
2023-03-24 11:13:38 +01:00
Anton
4edad3f41c Fix tables css [SCI-8185] 2023-03-23 13:05:37 +01:00
Anton
854fc1764b Refactor left/top navigation [SCI-8055] 2023-03-22 14:08:21 +01:00
Oleksii Kriuchykhin
7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin
b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
G-Chubinidze
06eeb3b27f
FE manage devices (table view) + revoking the device [SCI-7633] (#4920)
* FE manage devices (table view) + revoking the device [SCI-7633]

* revocation code optimisation

* hound fixes

---------

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-03-17 13:44:41 +01:00
aignatov-bio
5844fce23e
Merge pull request #5156 from aignatov-bio/ai-sci-8154-cleanup-old-protocol-code
Clean old protocol code [SCI-8154]
2023-03-17 11:26:41 +01:00
Anton
248b6b6581 Remove additional code 2023-03-17 11:11:59 +01:00
Alex Kriuchykhin
4dd5cb5de4
Adapt global search for new protocol versioning [SCI-8080] (#5158) 2023-03-17 10:43:50 +01:00
ajugo
7c287b3993
Reword project access permissions [SCI-8124] (#5146) 2023-03-15 13:53:43 +01:00
Soufiane
1d396e57ab
Update of a Task Filters on a dashboard (Clear/Close function, Show results) [SCI-7607] (#4873)
* Change the position of the clear button and update the Apply button text [SCI-7607]

* Add a clos button in the header of the dropdown [SCI-7607]

* Fix scss style issue [SCI-7607]

* Change gap to margin-right [SCI-7607]
2023-03-14 12:53:27 +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
sboursen-scinote
d2ceeb9662 Use I18n [SCI-8007] 2023-03-12 14:10:07 +01:00
sboursen-scinote
55ebb4817e Fix hound [SCI-8007] 2023-03-10 09:16:50 +01:00
sboursen-scinote
a419943e4e Merge 'protocol_versioning' into sb_SCI-8045 2023-03-09 16:29:40 +01:00
sboursen-scinote
e314dd4f51 Use I18n [SCI-8045] 2023-03-09 16:07:24 +01:00
Anton
ca5f61a0e2 Add all team members through access modal [SCI-8063] 2023-03-09 14:13:01 +01:00
artoscinote
a503aa1a9f
Add create draft activity name [SCI-8093] 2023-03-08 10:25:11 +01:00
Martin Artnik
e4e8997cc1 Add draft created activity [SCI-8093] 2023-03-07 14:45:52 +01:00
Soufiane
f22f00f856
Merge pull request #5067 from sboursen-scinote/sb_SCI-8032
Old buttons at importing protocols.io protocol [SCI-8032]
2023-03-07 14:13:02 +01:00
aignatov-bio
ce36a2565b
Merge pull request #5092 from aignatov-bio/ai-sci-8077-add-empty-state-for-protocol-actions-toolbar
Add empty state for protocol actions toolbar [SCI-8077]
2023-03-07 14:09:18 +01:00
Alex Kriuchykhin
f8a4e7ee65
Update logic for linked protocol templates with task [SCI-7973] (#5058) 2023-03-07 13:03:01 +01:00
Soufiane
1d80118393
Merge pull request #5035 from sboursen-scinote/sb_SCI-7996
Fix protocols repository table CSS [SCI-7996]
2023-03-07 12:50:10 +01:00
Martin Artnik
5e6f0fad83 Access modal translation amends [SCI-8060] 2023-03-07 12:14:02 +01:00
Anton
ece09ee9a5 Add empty state for protocol actions toolbar [SCI-8077] 2023-03-07 11:44:03 +01:00
Anton
ca76c78a23 Fix protocol creation error message [SCI-8003] 2023-03-06 19:31:45 +01:00
sboursen-scinote
34f324f7ca Update the sort component [SCI-8045] 2023-03-06 12:00:53 +01:00
aignatov-bio
47c59ecc6c
Fix protocol copy/save message [SCI-8064] (#5079) 2023-03-06 11:51:40 +01:00
sboursen-scinote
587606803b Update search placeholder [SCI-8045] 2023-03-06 09:28:21 +01:00
sboursen-scinote
443ee4350c Fix protocol repository sidebar on archived view [SCI-8030] 2023-03-03 14:11:40 +01:00
sboursen-scinote
515baa8de7 Update translations [SCI-8032] 2023-03-03 11:03:04 +01:00
ajugo
72cf844c3e
Fix protocol version modification info text [SCI-8061] (#5064) 2023-03-02 15:35:02 +01:00
ajugo
671e7dc2df
Remove double text in unlink/revert protocol modal [SCI-8052] (#5056) 2023-03-02 09:57:21 +01:00
Soufiane
3760073e87
Merge branch 'features/protocol_versioning' into sb_SCI-7909 2023-02-28 15:37:35 +01:00
Soufiane
2aee34ce56
Merge pull request #4955 from sboursen-scinote/sb_SCI-7904
Protocol templates - delete all steps (tasks screen) [SCI-7904]
2023-02-28 15:33:33 +01:00
Soufiane
53f2bc3be0
Merge pull request #4977 from sboursen-scinote/sb_SCI-7910
Protocol templates - revert action and alert message [SCI-7910]
2023-02-28 15:33:05 +01:00
ajugo
96cf2f1d38
Update protocol templates update action on task [SCI-7903] (#5009)
* Update protocol templates update action on task [SCI-7903]

* Simplify logic for update from parent [SCI-7903]
2023-02-28 14:17:34 +01:00
sboursen-scinote
1c9d9d8082 Add a small refactor [SCI-7910] 2023-02-28 14:13:18 +01:00
sboursen-scinote
e29bdcb51f Revome uneeded I18n config [SCI-7910] 2023-02-28 12:04:29 +01:00
sboursen-scinote
66edffe53a Use I18n [SCI-7910] 2023-02-28 12:03:00 +01:00
sboursen-scinote
e8cbc0364f Change the tanslation [SCI-7909] 2023-02-28 11:39:49 +01:00
ajugo
0328a32e09
Update import/export for protocol templates [SCI-7986] (#5032) 2023-02-27 13:22:01 +01:00
sboursen-scinote
af48cede1f Update protocol repository default view styles [SCI-7996] 2023-02-27 09:58:28 +01:00
ajugo
95d04d11d2
Fix validation for multiple parent protocols for drafts [SCI-7994] (#5020)
* Fix validation for multiple parent protocols for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]
2023-02-24 17:56:51 +01:00
Anton
60cda9b6f2 Fix version number for draft [SCI-7989] 2023-02-24 15:32:10 +01:00
aignatov-bio
5d3e6b7226
Merge pull request #5007 from aignatov-bio/ai-sci-7717-protocol-new-activities
Add new protocol activities [SCI-7717]
2023-02-22 10:48:20 +01:00
Anton
f7d7113239 Add new protocol activities [SCI-7717] 2023-02-22 10:46:24 +01:00
ajugo
0be0aa7629
Implement filters for protocol template datatable [SCI-7605] (#4918)
Implement filters for protocol template datatable [SCI-7605]
2023-02-21 14:57:43 +01:00
Anton
a95ca75362 Add new protocol modal [SCI-7810] 2023-02-21 14:15:53 +01:00
aignatov-bio
ae607839c1
Merge pull request #5002 from aignatov-bio/ai-sci-7715-update-protocol-io-front-end
Update protocolsIo front-end [SCI-7715]
2023-02-21 14:06:42 +01:00
ajugo
166208f186
Update i flyouts of protocols (task screen) [SCI-7861] (#5003) 2023-02-21 13:44:26 +01:00
Anton
c775a92914 Update protocolsIo front-end [SCI-7715] 2023-02-21 11:06:54 +01:00
artoscinote
8f8865c73c
Fix MarvinJS image toolbar issues [SCI-7934] (#4998) 2023-02-21 09:12:59 +01:00
ajugo
2c079cc918
Update protocol duplication [SCI-7900] (#4992) 2023-02-18 09:09:33 +01:00
ajugo
9a57071d7a
Update restore action for protocol templates [SCI-7634] (#4969)
* Update restore action for protocol templetes [SCI-7634]

* Move protocol table reload to methond [SCI-7634]
2023-02-16 18:03:11 +01:00
sboursen-scinote
0039edae66 Update the style of the revert protocol modal [SCI-7910] 2023-02-15 09:26:46 +01:00
sboursen-scinote
4b264db343 Update the text of the inlink protocol modal [SCI-7909] 2023-02-14 14:59:05 +01:00
ajugo
cb332f163f
Update the Load protocol template to task modal [SCI-7591] (#4870)
* Update the Load protocol template to task modal [SCI-7591]

* Update the Load protocol template to task modal [SCI-7591]

* Load last protocol version from repository to task [SCI-7591]

* Fix find_by for load_table [SCI-7591]
2023-02-14 13:19:24 +01:00
Anton
ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
Anton
dc5cfb9fc3 Add publish and delete action [SCI-7905] 2023-02-13 14:45:22 +01:00
Anton
743d901310 Add published view for protocol [SCI-7617] 2023-02-13 10:41:30 +01:00
Anton
3902310463 Update protocol view screen [SCI-7590] 2023-02-13 09:52:30 +01:00
sboursen-scinote
74773b773c Update the text of the delete all steps modal [SCI-7904] 2023-02-09 15:49:38 +01:00
Anton
b55f68c0dc Update archive action for protocol templates [SCI-7898] 2023-02-09 14:10:07 +01:00
aignatov-bio
23e50cf710
Merge pull request #4882 from aignatov-bio/ai-sci-7608-update-archive-view-for-protoco-templates
Add archive view for protocols template [SCI-7608]
2023-02-09 11:40:47 +01:00
Anton
1a0b28c74e Add archive view for protocols template 2023-02-09 11:38:27 +01:00
aignatov-bio
193ff7bc46
Merge pull request #4891 from aignatov-bio/ai-sci-7520-implement-version-modals-interactions
Add manage actions to version modal [SCI-7520]
2023-02-07 13:38:33 +01:00
Giga Chubinidze
9e3073b11e step timestamp changes 2023-02-07 15:53:58 +04:00
ajugo
9caa5be4c0
Updated protocol actions select menu in task [SCI-7820] (#4939) 2023-02-07 10:39:49 +01:00
ajugo
d66dc98300
Update print protocol modal [SCI-7830] (#4932) 2023-02-06 14:23:56 +01:00
artoscinote
3331c5fa3f
Merge pull request #4928 from G-Chubinidze/gc_SCI_7837
Step timestamp display [SCI-7837]
2023-02-06 12:03:02 +01:00
artoscinote
d9beafd9a7
Merge pull request #4903 from sboursen-scinote/sb_SCI-7676
CSS: error messages at moving experiment [SCI-7676]
2023-02-06 11:12:45 +01:00
Giga Chubinidze
9595f434d0 on/at convention fix 2023-02-05 23:00:20 +04:00
Alex Kriuchykhin
958f9784b0
Add minimum length validation to label template name [SCI-7319] (#4930) 2023-02-03 15:36:32 +01:00
Giga Chubinidze
ed4363484a Step timestamp display [SCI-7837] 2023-02-03 11:12:33 +04:00
Oleksii Kriuchykhin
e887e7c82b Merge branch 'develop' into features/sso-improvements 2023-02-01 16:08:56 +01:00
Alex Kriuchykhin
e1c4aa9469
Move Okta and Azure AD configurations to application settings [SCI-7609] (#4732) 2023-01-31 11:55:31 +01:00
Giga Chubinidze
a0a81eee1c My profile page updates of user data [SCI-7627] 2023-01-26 17:01:54 +04:00
sboursen-scinote
eced08e365 Add a dot in empty canvas sentence [SCI-7676] 2023-01-26 13:17:46 +01:00
Anton
466c25175f Add manage actions to version modal [SCI-7520] 2023-01-26 12:39:11 +01:00
aignatov-bio
a72de2800f
Merge pull request #4871 from aignatov-bio/ai-sci-7619-refactor-access-modals-pet
Refactor access modals P/E/T [SCI-7619]
2023-01-24 10:14:40 +01:00
Anton
00b792b1bb UX changes for permission modal [SCI-7619] 2023-01-23 16:01:40 +01:00
Anton
37eb902b25 Refactor access modals P/E/T [SCI-7619] 2023-01-22 22:23:18 +01:00
Alex Kriuchykhin
7f3999fa4f
Add protocol published versions modal [SCI-7519] (#4725) 2023-01-20 14:29:25 +01:00
artoscinote
7c0e3865cf
Merge pull request #4829 from G-Chubinidze/gc_SCI_7749
Filter modal on task table view - placeholder text [SCI-7749]
2023-01-17 13:25:37 +01:00
ajugo
1e01d1f2b7
Fix missing translation for field codes [SCI-7765] (#4826) 2023-01-16 10:21:10 +01:00
Giga Chubinidze
39280d35b0 Filter modal on task table view - placeholder text [SCI-7749] 2023-01-16 11:23:54 +04:00
sboursen-scinote
b55ca5b8cf Update Experiment edit button text from 'Edit Workflow' to 'Edit workflow' in Canvas view [SCI_7736] 2023-01-13 13:39:49 +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
d8adbb1d3d
Implement completed and due date changes [SCI-7725] (#4816) 2023-01-13 10:18:35 +01:00
aignatov-bio
9216ca2809
Merge pull request #4811 from aignatov-bio/ai-sci-7722-add-new-task-modal-improvments
Experiment table - add new task modal improvements [SCI-7722]
2023-01-13 10:13:22 +01:00