scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 23:21:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
15622 commits 31 branches 181 tags 166 MiB
Commit graph

3490 commits

Author SHA1 Message Date
ajugo
2afe589657
Remove double load of current task on dashboard page [SCI-8642] (#5597) 2023-06-15 09:41:46 +02:00
Anton
d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +02:00
Anton
4674f64905 Add new button style [SCI-8558] 2023-06-14 14:54:10 +02:00
Soufiane
606bdb118b
Prevent submitting forms multiple times [SCI-8560] (#5584) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-13 08:29:26 +02:00
artoscinote
e57da37ec7
Merge pull request #5573 from G-Chubinidze/gc_SCI_8366 
New icons implementation [SCI-8366]
 2023-06-12 11:25:36 +02:00
Martin Artnik
7dfbc960e3 Font fix + default label icon fix [SCI-8366] 2023-06-12 11:20:33 +02:00
artoscinote
0e14b7de8a
Merge pull request #5544 from sboursen-scinote/sb_SCI-8498 
Activity from dropdown disappeared [SCI-8498]
 2023-06-09 13:19:52 +02:00
artoscinote
75a70ec080
Merge pull request #5576 from sboursen-scinote/sb_SCI-8532 
Automatically close the Assign from inventory window on task screen [SCI-8532]
 2023-06-09 10:29:32 +02:00
Soufiane
77de460182
Due date flyout on dashboard calendar [SCI-8600] (#5554) 
* Change the scope of the DatePicker datetime format in global activities [SCI-8600]
 2023-06-09 09:24:32 +02:00
Martin Artnik
dcc30822f5 New icon tweaks & fixes [SCI-8366] 2023-06-08 17:33:50 +02:00
sboursen-scinote
154910602f Close the Assign from inventory window on success [SCI-8532] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-08 15:33:43 +02:00
G-Chubinidze
dc9d37226a
Update application.js.erb 2023-06-08 10:37:11 +04:00
Giga Chubinidze
a777fd5584 New icons implementation [SCI-8366] 2023-06-08 10:33:37 +04:00
artoscinote
dc59376a35
Merge pull request #5558 from sboursen-scinote/sb_SCI-8612 
"Number" column decimal units edit mode & infinite spinner [SCI-8612]
 2023-06-06 15:23:07 +02:00
Soufiane
ad0418947c
Modal stays open when renaming an inventory via the bottom toolbar [SCI-8613] (#5567) 
* Initialize rename and duplicate inventory models [SCI-8613]
 2023-06-06 15:18:21 +02:00
aignatov-bio
a032839d62
Merge pull request #5559 from aignatov-bio/ai-sci-8620-fix-reports-table-css 
Fix reports table css [SCI-8620]
 2023-06-06 12:52:33 +02:00
Martin Artnik
f344b72583 Fix save and load of folder checkbox in filters [SCI-8598] 2023-06-06 12:43:27 +02:00
Anton
0d6cf02eab Fix reports table css [SCI-8620] 2023-06-06 10:54:01 +02:00
sboursen-scinote
5ef6416f6e Refactor inline events in JavaScript HTML tempaltes [SCI-8612] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-06 09:45:00 +02:00
sboursen-scinote
e9c1d0d827 Redirect to experiment page and show flash on move [SCI-8603] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-05 11:58:59 +02:00
Soufiane
30c5b1675f
Missing warning messages when setting up new user [SCI-8595] (#5548) 
* Fix form errors in users invitation edit [SCI-8595]

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

* Fix form errors in users confirmation new [SCI-8595]

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

* Fix form errors in users registration [SCI-8595]

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

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-02 15:35:29 +02:00
sboursen-scinote
456670dd15 Fix Activities type dropdowns [SCI-8498] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-02 10:39:56 +02:00
artoscinote
c58a852e2a
Merge pull request #5532 from G-Chubinidze/gc_SCI_8098_8147 
Cursor position improvements, focused fields - part 1 & 2 [SCI-8098] [SCI-8147]
 2023-06-01 12:36:54 +02:00
artoscinote
66ccea318b
Merge pull request #5531 from G-Chubinidze/gc_SCI_8584 
Not responsive buttons with closed/opened navigator [SCI-8534]
 2023-06-01 12:25:07 +02:00
Giga Chubinidze
14b71d1374 hound fix 2023-06-01 14:24:27 +04:00
ajugo
17e89c6152
Fix extra large image preview for results [SCI-8585] (#5534) 2023-06-01 11:00:55 +02:00
ajugo
31fdaf5e55
Remove search terms on datatable refresh [SCI-8574] (#5533) 2023-06-01 09:52:58 +02:00
artoscinote
015c481a2b
Merge pull request #5530 from artoscinote/ma_SCI_8551 
Attempt to fix sporadic task table render errors [SCI-8551]
 2023-06-01 09:26:21 +02:00
Giga Chubinidze
801db4b7a4 added resize observer 2023-05-31 19:27:07 +04:00
artoscinote
79d9f3c404
Merge pull request #5523 from G-Chubinidze/gc_SCI_8575 
Empty state of inventories - Clickable empty row [SCI-8575]
 2023-05-31 16:30:20 +02:00
Martin Artnik
60a0a4ea9b Attempt to fix sporadic task table render errors [SCI-8551] 2023-05-31 16:17:25 +02:00
Soufiane
b40c750965
Turbolinks broken by default with a secure CSP [SCI-8583] (#5529) 
* Fix broken Turbolinks with CSP nonce [SCI-8583]
 2023-05-31 15:28:16 +02:00
Martin Artnik
7f7fc42ec8 Fix project sorting dropdown [SCI-8398] 2023-05-31 13:44:48 +02:00
Giga Chubinidze
9b7abe8de7 changed logic to accomodate globally 2023-05-31 15:36:09 +04:00
Giga Chubinidze
4c4bec1b50 Empty state of inventories - Clickable empty row [SCI-8575] 2023-05-31 11:52:15 +04:00
ajugo
d3006c9862
Fix archive/restore of protocol templates [SCI-8579] (#5521) 2023-05-31 09:38:24 +02:00
ajugo
d3e11b0dde
Hide experiment action row after archive/restore [SCI-8576] (#5519) 2023-05-31 09:38:09 +02:00
Giga Chubinidze
80b8a8803d amended focus fields 2023-05-31 11:08:16 +04:00
Soufiane
46fc3d17e6
Broken modal for sharing inventories [SCI-8548] (#5506) 
* Fix share_modal js loading [SCI-8548]

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

* Fix hound [SCI-8548]

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

* Fix hound [SCI-8548]

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

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-30 16:15:20 +02:00
Martin Artnik
44ad7703b2 Save and load project filters after table load [SCI-8398] 2023-05-30 15:31:15 +02:00
ajugo
2e9fe37040
Fix repository table reloading and flash messages [SCI-8554] (#5504) 
* Fix repository table reloading and flash messages [SCI-8554]

* Pass function for repository reload [SCI-8554]
 2023-05-29 11:48:13 +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
G-Chubinidze
43218900e4
Merge branch 'develop' into gc_SCI_8496 2023-05-29 13:27:18 +04:00
Giga Chubinidze
017781d0dc cleanup 2023-05-29 13:25:54 +04:00
artoscinote
1b1ecbfbaf
Merge pull request #5488 from G-Chubinidze/gc_SCI_8147 
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
 2023-05-29 11:08:41 +02:00
artoscinote
5612303f79
Merge pull request #5487 from G-Chubinidze/gc_SCI_8098 
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
 2023-05-29 11:07:53 +02:00
artoscinote
b1fe71719a
Merge pull request #5503 from sboursen-scinote/sb_SCI-8546 
Duplicated item created in the inventory [SCI-8546]
 2023-05-29 10:38:42 +02:00
ajugo
e2624987bd
Save repository table page to local storage [SCI-8512] (#5501) 2023-05-29 10:27:00 +02:00
sboursen-scinote
6240dd0a5f Fix hound [SCI-8546] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-29 09:55:31 +02:00
sboursen-scinote
65cad3fedd Fix duplicated items created in inventories [SCI-8546] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-28 22:36:52 +02:00
Giga Chubinidze
038226fa19 removed test code 2023-05-26 13:44:11 +04:00
aignatov-bio
642932bbcc
Merge pull request #5475 from rekonder/aj_SCI_8490 
Add empty states for PET [SCI-8490]
 2023-05-26 11:14:38 +02:00
aignatov-bio
e25f91daf7
Merge pull request #5482 from aignatov-bio/ai-sci-8483-fix-toolbar-and-pagination 
Unify datatables layout [SCI-8583]
 2023-05-26 11:13:18 +02:00
Giga Chubinidze
81db122a08 Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147] 2023-05-26 03:14:27 +04:00
Giga Chubinidze
d72653aff2 Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098] 2023-05-26 02:59:19 +04:00
Soufiane
fc1ce332de
Issue with scrollbar in smart annotation pop-up [SCI-8420] (#5479) 
* Fix issues in smart annotation pop-up

- Initialize perfectScrollBar on the current atWho container.
- Close AtWho pop-up when tinyMCE editor is closed.

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

* Fix hound [SCI-8420]

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

* Close smart annotation pop-up after tinyMCE save [SCI-8420]

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

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-25 16:01:36 +02:00
G-Chubinidze
2e21e286b7
Merge branch 'develop' into gc_SCI_8464 2023-05-25 15:32:00 +04:00
Anton
e755eb73a3 Unify datatables layout [SCI-8583] 2023-05-25 13:12:27 +02: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
aignatov-bio
9470313899
Merge pull request #5473 from aignatov-bio/ai-sci-8518-multiple-css-fixes 
Multiple small css fixes [SCI-8518]]SCI-8529]
 2023-05-24 12:11:11 +02:00
aignatov-bio
1da074bc2a
Merge pull request #5461 from G-Chubinidze/gc_SCI_8370 
Revamp of (top) toolbar - Reports [SCI-8370]
 2023-05-24 12:07:17 +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
Anton
007eae16cc Multiple small css fixes [SCI-8518]]SCI-8529] 2023-05-24 12:03:47 +02:00
Giga Chubinidze
5cd32d5cfa hound fix 2023-05-24 13:48:32 +04:00
Giga Chubinidze
34d64f6f44 hound fix 2023-05-24 13:39:38 +04:00
Anton
5a7530cdfb Fix label templates pagination [SCI-8483] 2023-05-24 11:24:02 +02:00
Soufiane
c7fcd0a52f
Activate assign items button in Results page [SCI-8419] (#5469) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-24 10:35:58 +02: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
Soufiane
136fff1f09
Using more than one way of adding file results file title is lost [SCI-8346] (#5354) 
Persist uploaded items names when adding new ones [SCI-8346]
 2023-05-23 17:30:37 +02:00
Giga Chubinidze
1b060893e7 moved toolbar 2023-05-23 18:03:10 +04:00
ajugo
040b3bddce
Add state switch to experiment level for archived experiments [SCI-8503] (#5464) 2023-05-23 15:29:14 +02:00
aignatov-bio
cdec8023ba
Merge pull request #5448 from aignatov-bio/ai-sci-8413-fix-action-toolbar-init 
Fix action toolbar init [SCI-8413]
 2023-05-23 12:20:16 +02:00
Anton
c107a48d61 Fix action toolbar init [SCI-8413] 2023-05-23 12:08:04 +02:00
aignatov-bio
2bbeef0775
Merge pull request #5457 from G-Chubinidze/gc_SCI_8302 
Reports bottom action toolbar position update [SCI-8302]
 2023-05-23 12:02:55 +02:00
Giga Chubinidze
31807eb4ab updated padding of table & toolbar 2023-05-23 13:15:19 +04:00
aignatov-bio
9c20916d8a
Merge pull request #5453 from aignatov-bio/ai-sci-8515-refactor-inventories-scrolling 
Fix inventory page layout [SCI-8515]
 2023-05-23 10:34:47 +02:00
ajugo
3036c24be3
Prevent double click on protocol creation modal [SCI-8466] (#5458) 2023-05-23 09:50:34 +02:00
Anton
ecbd900362 Fix inventory page layout [SCI-8515] 2023-05-22 15:47:59 +02:00
Anton
7c9142de5e Fix action toolbar init [SCI-8413] 2023-05-22 11:31:46 +02:00
artoscinote
ad64628c8c
Merge pull request #5435 from aignatov-bio/ai-sci-8480-fix-protocols-icons-position 
Fix protocol icons position [SCI-8480]
 2023-05-18 16:46:02 +02:00
Martin Artnik
e0fb01f164 Remove unecessary view mode button text update [SCI-8436] 2023-05-18 16:43:11 +02:00
ajugo
7e771d457e
Fix assigning items from smart annotation with one team inventory [SCI-8484] (#5434) 2023-05-18 16:23:00 +02:00
Soufiane
351ba06840
FIX: new relic CSP [SCI-8118][SCI-8119] (#5430) 
Switch to newRelic manual browser agent using a nonce [SCI-8118][SCI-8119]
 2023-05-18 14:20:20 +02:00
Anton
c57188853e Fix protocol icons position 
[SCI-8480]
 2023-05-18 14:00:05 +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
557b422935
Revert "Revamp of (top) toolbar - Reports [SCI-8370]" 2023-05-18 09:46:28 +02:00
artoscinote
8bd6759d5d
Merge pull request #5387 from G-Chubinidze/gc_SCI_8370 
Revamp of (top) toolbar - Reports [SCI-8370]
 2023-05-18 09:46:03 +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
Alex Kriuchykhin
0cc253172f
Merge pull request #5326 from rekonder/aj_SCI_8082 
Reverse table header/row numbering for plate templates [SCI-8082]
 2023-05-18 09:34:19 +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
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
Martin Artnik
c8521cd9c4 Make search icon right-alinged [SCI-8301] 2023-05-16 12:30:32 +02:00
Martin Artnik
c8994573fd Add bottom action toolbar to label templates [SCI-8301] 2023-05-16 11:40:07 +02:00
artoscinote
a856759c08
Merge pull request #5379 from sboursen-scinote/sb_SCI-8378 
Select/Unselect all does not update visibility of buttons [SCI-8378]
 2023-05-16 10:40:06 +02:00
ajugo
c6f5219043
Display all protocol templates for team admin [SCI-8379] (#5391) 2023-05-16 10:29:00 +02:00
Anton
9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02:00
Soufiane
c28f86d46d
Refactor inline events [SCI-8434] (#5403) 
Refactor inline events in task results [SCI-8434]
 2023-05-16 09:34:36 +02:00
Anton
e2a14c1853 Refactor Module page layout [SCI-8421] 2023-05-15 14:17:41 +02:00
Soufiane
9c3f6812bd
CSS: label printer part 2 [SCI-8374] (#5381) 
* Fix pin and checkbox alignment in the header [SCI-8374]

* Fix hound [SCI-8374]
 2023-05-15 09:00:37 +02:00
ajugo
e0b742b336
Fix assigning of inventory items from inventory card [SCI-8416] (#5397) 2023-05-11 13:18:19 +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
Oleksii Kriuchykhin
f903ec80e5 Merge branch 'hotfix/1.27.1.2' into develop 2023-05-10 10:35:45 +02:00
Giga Chubinidze
57c0e299e8 Revamp of (top) toolbar - Reports [SCI-8370] 2023-05-10 01:09:05 +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
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
sboursen-scinote
b7cc592a3d Fix the duplicate and delete buttons when select_all is clicked [SCI-8378] 2023-05-08 17:06:15 +02:00
sboursen-scinote
47fde38cde Refactor the onClick on template label names to fit the CSP [SCI-8378] 2023-05-08 17:02:26 +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
Andrej
97bde133a8 Fix plate template JSON creation [SCI-8082] 2023-05-08 10:25:50 +02:00
sboursen-scinote
5f8eafedf9 Create a modal for item assignment from inventory page [SCI-8250] 
- Fix the behavior of the search_select.
- Fix select options positioning.
- Get the items to assign from selected rows.
- Style the modal.

Style the modal [SCI-8250]

Fix select options positioning [SCI-8250]
 2023-05-08 09:43:18 +02:00
Martin Artnik
cd7b365613 Project dropdown menu fixes [SCI-8393] 2023-05-05 15:47:53 +02:00
Anton
560ddca839 Add html support to disclaimer body and enable during registration [SCI-8410][SCI-8407] 2023-05-05 10:44:22 +02:00
Martin Artnik
7a6fe5050d Fix project folder delete action [SCI-8391] 2023-05-04 14:59:16 +02:00
artoscinote
ef8a518a83
Merge pull request #5360 from artoscinote/ma_SCI_8298 
Implement task table bottom toolbar [SCI-8298]
 2023-05-04 14:40:53 +02:00
Anton
5a9470f5dd Fix navigator update [SCI-8390] 2023-05-04 14:02:04 +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
ajugo
2b82b6a74e
Include plate templates metadata to the protocol import/export [SCI-8354] (#5348) 2023-05-03 16:38:07 +02:00
Soufiane
94465ffb93
Unicode issue in Protocol and destroy user modal [SCI-7512] (#5328) 
* Fix unicode issue in destroy team member modal [SCI-7512]
 2023-05-03 16:08:46 +02:00
Soufiane
1b34de37ef
CSP and inline js refactor [SCI-8118][SCI-8119] (#5206) 
CSP and inline js refactor [SCI-8118][SCI-8119]
 2023-05-03 11:31:17 +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
834bf0984d
Move generation of user annotation popover to FE [SCI-7977] (#5124) 
Move user popover to FE [SCI-7977]
 2023-05-03 09:46:18 +02:00
Giga Chubinidze
a83625fbef Revamp of (top) toolbar + search field - inventories [SCI-8306] 2023-05-03 00:58:11 +04: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
Anton
1bc2baf1f3 Add navigator interactions [SCI-8047] 2023-04-26 10:34:02 +02:00
ajugo
9b49745194
Fix repository_row call when no repository row is selected [SCI-8281] (#5301) 2023-04-25 15:18:12 +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
G-Chubinidze
468a5bd2df
Merge pull request #5340 from G-Chubinidze/gc_SCI_8303 
Revamp of (top) toolbar - projects, experiments [SCI-8303] [SCI-8304]
 2023-04-25 16:51:30 +04:00
Soufiane
ea94cf4581
Bulk editing will display inaccurate changes after saving [SCI-8219] (#5267) 
Fix race condition when submitting all forms [SCI-8219]
 2023-04-25 14:35:45 +02:00
ajugo
0c24360a81
Fix error message for protocol notes and repository item name [SCI-7185] (#5258) 2023-04-25 14:34:14 +02:00
aignatov-bio
af9219b7ae
Assign item through repository item modal [SCI-8141] (#5237) 2023-04-25 14:30:14 +02:00
G-Chubinidze
e9cacc3db1
Open Inventory - Double action fix [SCI-7506] (#5200) 
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
 2023-04-25 14:21:41 +02:00
Anton
3724c38e7d Add archived state for navigator [SCI-8056] 2023-04-25 13:57:29 +02:00
G-Chubinidze
540de67956
Open the label template in the same tab [SCI-8167] (#5189) 
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
 2023-04-25 13:12:25 +02:00
aignatov-bio
32dc12f4d0
Merge pull request #5336 from aignatov-bio/ai-sci-8233-add-backend-for-navigator 
Add backend for navigator [SCI-8233]
 2023-04-24 12:50:14 +02:00
Anton
cb6b2c3855 Add backend for navigator [SCI-8233] 2023-04-24 12:25:56 +02:00
Giga Chubinidze
a0d863e230 Revamp of (top) toolbar - projects [SCI-8303] 2023-04-24 01:43:47 +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
Andrej
a33707bd5e Reverse table header/row numbering for plate templates [SCI-8082] 2023-04-19 12:22:22 +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
sboursen-scinote
b8b33fe480 Update configuration after protocol.io changed default page_id to 0 [SCI-8286] 2023-04-18 12:43:56 +02:00
Anton
1526553467 Small fixes for notificaitions [SCI-8331] 2023-04-17 15:23:52 +02:00
aignatov-bio
83790be734
Merge pull request #5112 from aignatov-bio/ai-sci-7960-add-disclaimer-to-login-page 
Add disclaimer modal [SCI-7960]
 2023-04-17 11:25:06 +02:00
Anton
8202d2e817 Add disclaimer modal [SCI-7960] 2023-04-17 11:22:50 +02:00
ajugo
b62f1f5405
Add missing flash messages [SCI-8247] (#5308) 2023-04-14 15:10:35 +02:00
Anton
acd6413ca3 Fix navigation sidebar [SCI-8288] 2023-04-14 11:38:28 +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
sboursen-scinote
dcd6f6267d Merge develop in to sb_SCI-7815 [SCI-7815] 2023-04-12 15:46:52 +02:00
Anton
5ad0d1c593 Small fixes for horizontal scrollbar [SCI-8269] 2023-04-12 15:23:35 +02:00
artoscinote
9769a70e08
Merge pull request #5282 from G-Chubinidze/gc_SCI_8211 
Label "(Draft)" in front of the protocol template name [SCI-8211]
 2023-04-12 14:37:15 +02:00
Martin Artnik
eb243ca772 Fix project pages JS selectors [SCI-8292] 2023-04-12 12:33:45 +02:00
Giga Chubinidze
9d7fb94758 added condition check, now it only fires on inline_edit field 2023-04-11 18:47:01 +04:00
aignatov-bio
82333bdc18
Merge pull request #5222 from sboursen-scinote/sb_SCI-8134 
Role dropdown on protocols.io import to SciNote [SCI-8134]
 2023-04-11 11:22:50 +02:00
artoscinote
94b319f16d
Merge pull request #5277 from sboursen-scinote/sb_SCI-8286 
Protocols.io search appending results at the end of the list [SCI-8286]
 2023-04-11 11:02:47 +02:00
sboursen-scinote
6d984d8dfc Fix protocol.io search [SCI-8286] 
- Reduce the number of displayed publications to 20 for speed
- Clear the search result each time a new key (search sentence) is used
 2023-04-11 10:30:58 +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
artoscinote
f2df505cfe
Merge pull request #5263 from okriuchykhin/ok_SCI_8207 
Refactor user_notifications controller, remove unused code [SCI-8207]
 2023-04-06 16:03:40 +02:00
Martin Artnik
fd4bfc9ae6 Fix sidebar hiding [SCI-8270] 2023-04-06 14:57:57 +02:00
Oleksii Kriuchykhin
60579465ab Refactor user_notifications controller, remove unused code [SCI-8207] 2023-04-06 14:57:00 +02:00
Giga Chubinidze
2657c8c172 hound fixes 2023-04-06 16:31:07 +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
artoscinote
bd02b71efe
Merge pull request #5157 from sboursen-scinote/sb_SCI-7670 
Pressing Enter button cancels adding of a image on task result [SCI-7670]
 2023-04-05 15:27:22 +02:00
Anton
0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
Giga Chubinidze
3fc2afde3c Label '(Draft)' in front of the protocol template name [SCI-8211] 2023-03-31 18:30:26 +04:00
ajugo
562577e960
Add flash message for removing all users [SCI-8238] (#5232) 2023-03-31 12:14:26 +02:00
sboursen-scinote
2dfcb56748 Fix dropdown direction in modals [SCI-8134] 2023-03-28 17:19:37 +02:00
Martin Artnik
6412a65d7e Fix new protocol default role, fix reload of protocol access modal [SCI-8217] 2023-03-28 16:22:38 +02:00
Martin Artnik
9904c7aae3 Add error flash when assignment update fails [SCI-8131] 2023-03-27 12:38:01 +02: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
artoscinote
00191e41de
Merge pull request #5192 from scinote-eln/features/token-revocation 
Features/token revocation
 2023-03-24 11:13:38 +01:00
ajugo
e065098082
Fix protocol templates rows selection flickering [SCI-8105] (#5185) 
* Fix protocol templates rows selection flickering [SCI-8105]

* Fix double initialization of row selection [SCI-8105]
 2023-03-23 13:40:21 +01:00
Anton
4edad3f41c Fix tables css [SCI-8185] 2023-03-23 13:05:37 +01:00
ajugo
4c42748e40
Add protocolsIO import preview [SCI-8187] (#5183) 2023-03-23 12:18:30 +01:00
Giga Chubinidze
24da5a8a11 Update sidebar interactions [SCI-8128] 2023-03-23 12:54:14 +04:00
ajugo
8eb04c50c2
Add removing connected device [SCI-8146] (#5174) 2023-03-21 16:44:24 +01:00
artoscinote
44098ece5d
Revert "Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]" 2023-03-21 15:26:06 +01:00
artoscinote
e2dc2e31ee
Revert "Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]" 2023-03-21 15:24:40 +01:00
artoscinote
a43c941b50
Merge pull request #5170 from G-Chubinidze/gc_SCI_8147 
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
 2023-03-21 15:18:37 +01:00
artoscinote
634b4145fd
Merge pull request #5169 from G-Chubinidze/gc_SCI_8098 
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
 2023-03-21 15:17:55 +01:00
Giga Chubinidze
9dcd2f1500 Cursor position improvements, focused fields - part 2 [SCI-8147] 2023-03-21 13:17:44 +04:00
Giga Chubinidze
b7490ebcca Cursor position improvements, focused fields - part 1 [SCI-8098 2023-03-21 11:14:44 +04: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
Anton
da36b7268f Clean old protocol code [SCI-8154] 2023-03-16 14:37:19 +01:00
sboursen-scinote
0526bfaae1 Fix the result asset cancel behavior when clicking enter [SCI-7670] 2023-03-16 14:19:24 +01:00
Anton
5a242021e3 Fix handson table metadata issue [SCI-8138] 2023-03-16 12:02:20 +01:00
aignatov-bio
fedd9e040e
Fix escaping for protocol keyword [SCI-8137] (#5147) 2023-03-15 16:04:33 +01:00
Alex Kriuchykhin
483a7aad5b
Improve special character escaping in data attributes [SCI-8137] (#5149) 2023-03-15 16:01:01 +01:00
aignatov-bio
44823da268
Fix escaping for dropdown options and keywords escaping [SCI-8137] (#5145) 2023-03-15 12:55:28 +01:00
Alex Kriuchykhin
00c63b280e
Fix displaying of escaped fields [SCI-8137] (#5141) 2023-03-15 11:14:52 +01:00
sboursen-scinote
c6bb9850ea Merge feature/protocol_versioning into sb_SCI-8007 [SCI-8007] 2023-03-15 09:24:45 +01:00
aignatov-bio
9a3b056d32
Fix access modal for protocol [SCI-8063] (#5128) 2023-03-14 14:49:11 +01:00
ajugo
917269a8e9
Add micro-interactions for protocol repository modals [SCI-8091] (#5102) 2023-03-14 14:20:03 +01:00
ajugo
8acbf0b4f1
Fix revert protocol action for linked task changes [SCI-8110] (#5125) 2023-03-14 13:03:37 +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
aignatov-bio
e6c204a246
Fix save as new protocol modal [SCI-8003] (#5129) 2023-03-14 10:22:09 +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
aignatov-bio
40f223deca
Fix XSS for tasks table titles [SCI-8133] (#5134) 2023-03-13 15:19:59 +01:00
aignatov-bio
946ea47d55
Fix xss for titles in tags labels [SCI-8133] (#5130) 2023-03-13 14:39:12 +01:00
ajugo
1b9b10ccfb
Fix clickaway filtering for empty filter states [SCI-8103] (#5122) 2023-03-13 13:04:23 +01:00
sboursen-scinote
55ebb4817e Fix hound [SCI-8007] 2023-03-10 09:16:50 +01:00
sboursen-scinote
506c750eee Use datatable ajax to send version param [SCI-8007] 2023-03-09 21:59:14 +01:00
sboursen-scinote
c4bdbdec9a Merge branch 'features/protocol_versioning' into sb_SCI-8007 2023-03-09 16:35:36 +01:00
Soufiane
9b444cd8fb
Merge pull request #5110 from sboursen-scinote/sb_SCI-8045 
CSS bugs for "Protocol templates" [SCI-8045]
 2023-03-09 16:30:46 +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
aignatov-bio
376aa26ac5
Clear name on protocol create modal open [SCI-8003] (#5113) 2023-03-09 15:57:05 +01:00
ajugo
b1468df3e1
Fix checkboxes at the protocol template table [SCI-8099] (#5108) 2023-03-09 15:01:21 +01:00
Martin Artnik
ca4a5360ed Fix protocol link and step delete modal styling [SCI-8109] 2023-03-09 13:53:52 +01:00
Alex Kriuchykhin
87153b8899
Improve filtering of user supplied data in the input and text fields [SCI-8095] (#5106) 2023-03-09 11:38:47 +01:00
sboursen-scinote
7e58eff8de Fix hound [SCI-8045] 2023-03-08 20:56:22 +01:00
sboursen-scinote
45f3d05fdc Fix hound [SCI-8007] 2023-03-08 16:31:24 +01:00
sboursen-scinote
b3f7c41548 Update the filter dropDown globaly [SCI-8007] 2023-03-08 16:25:10 +01:00
sboursen-scinote
4ec15ede61 Implement the linked_children dropdown and update the modal [SCI-8007] 2023-03-08 15:15:41 +01:00
Anton
2a794b68ac Fix protocol duplication table reload [SCI-8074] 2023-03-07 14:31:15 +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
Soufiane
d801677392
Merge branch 'develop' into sb_SCI-7562 2023-03-07 12:52:05 +01:00
Anton
ece09ee9a5 Add empty state for protocol actions toolbar [SCI-8077] 2023-03-07 11:44:03 +01:00
artoscinote
5407943bfd
Merge pull request #5083 from artoscinote/ma_SCI_8039 
Protocol/general user assignment changes and fixes [SCI-8039][SCI-8037]
 2023-03-07 10:55:37 +01:00
aignatov-bio
1d9785efbe
Fix version button at action toolbar [SCI-8065] (#5085) 2023-03-07 09:52:31 +01:00
Martin Artnik
2f29477e02 Protocol/general user assignment changes and fixes [SCI-8039] 2023-03-06 16:43:46 +01:00
sboursen-scinote
587606803b Update search placeholder [SCI-8045] 2023-03-06 09:28:21 +01:00
sboursen-scinote
676eb96d00 Fix linked tasks column title [SCI-8045] 2023-03-06 08:25:46 +01:00
aignatov-bio
da31883ac3
Add error handling to actions in protocol controller [SCI-8073] (#5074) 2023-03-03 15:33:08 +01:00
ajugo
8b1bc51950
Fix loading of i icon on protocol [SCI-8051] (#5061) 2023-03-03 09:55:42 +01:00
sboursen-scinote
c93c8b4c5b Update full-preview-panel data id on protocol-card change [SCI-8032] 2023-03-03 09:00:12 +01:00
sboursen-scinote
8460fe3693 Implement the grant access to all team members functionality [SCI-8032] 2023-03-03 08:58:41 +01:00
Martin Artnik
165e012d23 Replace highlight.js with prism.js [SCI-7974] 2023-02-28 16:22:35 +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
artoscinote
fab7d9c3d6
Merge pull request #5038 from artoscinote/ma_SCI_7990 
Fix protocol duplication in table [SCI-7990]
 2023-02-28 14:28:08 +01:00
Martin Artnik
a3ffb38d2b Refactor cloning feature to better prepare for bulk clone [SCI-7990] 2023-02-28 14:22:02 +01:00
sboursen-scinote
1c9d9d8082 Add a small refactor [SCI-7910] 2023-02-28 14:13:18 +01:00
aignatov-bio
68cb18133f
Merge pull request #5027 from sboursen-scinote/sb_SCI-7991 
Versions button is not connected to the actions toolbar [SCI-7991]
 2023-02-28 12:09:14 +01:00
sboursen-scinote
66edffe53a Use I18n [SCI-7910] 2023-02-28 12:03:00 +01:00
sboursen-scinote
b99d9c485c Revert "Update the style of the unlink protocol modal [SCI-7909]" 
This reverts commit 0f9dcda99b.
 2023-02-28 11:51:42 +01:00
sboursen-scinote
24e0fb6b48 Make it DRY [SCI-7991] 2023-02-28 10:39:56 +01:00
ajugo
0328a32e09
Update import/export for protocol templates [SCI-7986] (#5032) 2023-02-27 13:22:01 +01:00
sboursen-scinote
548cdf9457 Open protocol versions modal when actions-toolbar button is clicked [sb_SCI-7991] 2023-02-24 16:23:23 +01:00
Anton
826cb162da Add save as draft action 2023-02-22 14:59:48 +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
ajugo
461d06dad9
Fix import protocol [SCI-7915] (#4980) 2023-02-20 10:14:32 +01:00
ajugo
2c079cc918
Update protocol duplication [SCI-7900] (#4992) 2023-02-18 09:09:33 +01:00
aignatov-bio
c92faeb48c
Merge pull request #4987 from aignatov-bio/ai-sci-7948-fix-cell-allignment-step-tables 
Add step table metadata during import/export and copy [SCI-7948]
 2023-02-18 08:44:37 +01:00
sboursen-scinote
063b125778 Fix hound issues [SCI-7815] 2023-02-17 15:47:37 +01:00
Martin Artnik
fbf7e69100 Fix MarvinJS image toolbar [SCI-7934] 2023-02-17 15:43:57 +01:00
sboursen-scinote
9dbced7b39 Fix select-all behavior for task table [SCI-7815] 2023-02-17 15:39:24 +01:00
Anton
df8579d52f Add step table metadata during import/export and copy [SCI-7948] 2023-02-17 14:50:45 +01:00
sboursen-scinote
2df05776c2 Update select-all on action-bottons [SCI-7815] 2023-02-17 12:50:26 +01:00
sboursen-scinote
ed9aab8ee9 Fix select-all behavior for experiment table [SCI-7815] 2023-02-17 12:39:04 +01:00
sboursen-scinote
b5c8879e57 Fix the behavior of the select-all checkbox in projects table [SCI-7815] 2023-02-17 09:18:32 +01:00
sboursen-scinote
9dd5c4d024 Add a small refactor [SCI-7815] 2023-02-16 23:18:35 +01:00
sboursen-scinote
0f606352fb Refactor reports_datatable and fix the select-all-checkbox functionality [SCI-7815] 2023-02-16 23:17:32 +01:00
sboursen-scinote
9852c4507e Fix typo [SCI-7815] 2023-02-16 20:21:46 +01:00
sboursen-scinote
b0d8d80b1d Fix the behavior of the select-all checkbox in protocol template datatables [SCI-7815] 2023-02-16 20:04:34 +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
Alex Kriuchykhin
ed76fac640
Speed up loading of current tasks widget [SCI-7885] (#4982) 2023-02-16 13:57:17 +01:00
Anton
a4e622b903 Update export action in protocol repository [SCI-7901] 2023-02-16 11:39:54 +01:00
Anton
568ab0ff66 Fix tab button on name edit fields [SCI-7922] 2023-02-14 18:24:50 +01:00
ajugo
aa3ea584a9
Fix visibility of archived by and on column in repository [SCI-7674][7924] (#4973) 2023-02-14 16:27:17 +01:00
sboursen-scinote
0f9dcda99b Update the style of the unlink protocol modal [SCI-7909] 2023-02-14 16:26:06 +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
7f58440b0e Fix infinite scroll [SCI-7836] 2023-02-14 12:29:43 +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
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
8313572df4
Merge pull request #4953 from sboursen-scinote/sb_SCI-7625 
Assign users to task - dropdown not refreshed after removing user  [SCI-7625]
 2023-02-09 16:44:47 +01:00
Anton
b55f68c0dc Update archive action for protocol templates [SCI-7898] 2023-02-09 14:10:07 +01:00
sboursen-scinote
b0505adc4d Fix hound issues [SCI-7625] 2023-02-09 12:37:35 +01:00
sboursen-scinote
dc333f77d5 Update the Selector when a user is selected/deselected [SCI-7625] 2023-02-09 12:30:51 +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
artoscinote
b9be286802
Merge pull request #4908 from sboursen-scinote/sb_SCI-7674 
Inventories: archived by and archived on seen on active item list [SCI-7674]
 2023-02-07 10:23:28 +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
aignatov-bio
bfb035d339
Merge pull request #4936 from aignatov-bio/ai-sci-7834-save-handson-table-metadata 
Save handson table metadata [SCI-7834]
 2023-02-06 14:24:51 +01:00
Anton
3849b1a7a1 Save handson table metadata [SCI-7834] 2023-02-06 14:21:55 +01:00
sboursen-scinote
c39b660fe3 Format error before sending it from back-end [SCI-7831] 2023-02-06 13:29:15 +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
sboursen-scinote
43680f1295 Remove the key prefix (e.g. Name:) from the form-control error message [SCI-7831] 2023-02-06 11:12:32 +01:00
Soufiane
937c8564f0
Update Invite new user to team modal [SCI-6007] (#4854) 
Update Invite new user to team modal [SCI-6007]
 2023-02-01 16:27:50 +01:00
Alex Kriuchykhin
dadb2fdf06
Merge pull request #4909 from okriuchykhin/ok_SCI_7816 
Fix date time inventories reminder processing [SCI-7816]
 2023-02-01 16:26:54 +01:00
artoscinote
3742dc1e54
Merge pull request #4899 from sboursen-scinote/sb_SCI-7818 
Default sorting in tables is saved (user specific) [SCI-7818]
 2023-02-01 09:36:23 +01:00
aignatov-bio
8ad21fea35
Finalize access managment for protocol [SCI-7677] (#4853) 2023-01-31 10:34:32 +01:00
Oleksii Kriuchykhin
fa96a9a939 Fix date time inventories reminder processing [SCI-7816] 2023-01-30 17:07:27 +01:00
sboursen-scinote
408dd7dcd8 Reinitialize the Table when switching the View from archived to active [SCI-7674] 2023-01-30 15:33:08 +01:00
sboursen-scinote
42eae72d2a Update the layout of the move-experiment-modal when there are errors [SCI-7676] 2023-01-30 12:00:33 +01:00
sboursen-scinote
3f355ac108 Revert change to default table sorting [SCI-7818] 2023-01-27 15:54:34 +01:00
sboursen-scinote
4be094680a Enable inventories datatable settings saving in localStorage [SCI-7818] 2023-01-27 14:44:39 +01:00
sboursen-scinote
ae61d34a71 Enable reports datatable settings saving in localStorage [SCI-7818] 2023-01-27 14:28:50 +01:00
sboursen-scinote
1dc0c8dcdf Enable label template datatable settings saving in localStorage [SCI-7818] 2023-01-27 14:10:32 +01:00
sboursen-scinote
d6194da3c6 Cancel action on Enter [SCI-7811] 2023-01-26 15:29:08 +01:00
sboursen-scinote
134acadb41 Cancel editing on Tab [SCI-7811] 2023-01-26 15:15:40 +01:00
Anton
466c25175f Add manage actions to version modal [SCI-7520] 2023-01-26 12:39:11 +01:00
sboursen-scinote
9cb52d6b5a Set the default sotring of team users datatable to asc on name [SCI-7562] 2023-01-25 14:58:17 +01:00
sboursen-scinote
e387e920f3 Set the default sotring of label template datatable to desc on name [SCI-7562] 2023-01-25 14:31:43 +01:00
artoscinote
07f2b83f81
Merge pull request #4828 from sboursen-scinote/sb_SCI-7745 
Fix: Edit task from experiment table view - Enter causes error [SCI-7745]
 2023-01-24 10:21:20 +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
sboursen-scinote
874b026c33 Clear table sci-checkbox after rename[SCI-7745] 2023-01-20 14:14:18 +01:00
sboursen-scinote
87ca1fcb77 Revert changes to clearRowTaskSelection [SCI-7745] 2023-01-20 13:54:41 +01:00
Alex Kriuchykhin
5238a858bd
Fix tags modal in table view for archived tasks [SCI-7743] (#4867) 2023-01-20 10:21:52 +01:00
ajugo
d178235dec
Fix the experiment table view checkbox toggling [SCI-7792] (#4866) 2023-01-19 17:59:41 +01:00
ajugo
0973659f52
Fix duplicated tasks in the table after filtering or duplicating [SCI-7794] (#4865) 2023-01-19 17:59:12 +01:00
sboursen-scinote
658862fca7 Refactor using delegated event [SCI-7745] 2023-01-19 15:36:34 +01:00
sboursen-scinote
3e60885d05 Fix the css selector in the clearnRowTaskSelection method and clear the checkboxes on task rename action [SCI-7745] 2023-01-19 15:35:25 +01:00
ajugo
6110068026
Fix protocols.io import [SCI-7791] (#4861) 2023-01-19 13:09:48 +01:00
artoscinote
c1c8425a93
Merge pull request #4857 from artoscinote/ma_SCI_7778 
Fix text result creation [SCI-7778]
 2023-01-19 13:02:12 +01:00
artoscinote
20dee016ab
Merge pull request #4860 from artoscinote/ma_SCI_7780 
Initialize task provisioning polling on table page load [SCI-7780]
 2023-01-19 13:01:31 +01:00
Anton
a39058ffe5 Fix table overflow for TinyMCE [SCI-7782] 2023-01-19 12:56:15 +01:00
Martin Artnik
8f97b8ad93 Initialize task provisioning polling on table page load [SCI-7780] 2023-01-19 12:35:24 +01:00
Martin Artnik
6bddd6c716 Fix text result creation [SCI-7778] 2023-01-19 08:58:05 +01:00
aignatov-bio
296ea04b62
Merge pull request #4734 from aignatov-bio/ai-sci-7518-manage-access-modal 
Add access modal for protocols [SCI-7518]
 2023-01-18 14:27:46 +01:00
Anton
2e8a02f79f Fix markup 2023-01-18 14:18:06 +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
3466a67de1
Merge pull request #4838 from okriuchykhin/ok_SCI_7743 
Fix tags editing for archived tags [SCI-7743]
 2023-01-17 17:31:02 +01:00
Martin Artnik
e0fff38d49 Always use e.currentTarget [SCI-7737] 2023-01-17 16:13:19 +01:00
aignatov-bio
42bf090eb3
Merge pull request #4846 from aignatov-bio/ai-sci-7540-improve-microinteracitons-experiment-table 
Improve microinteractions in experiment table [SCI-7540]
 2023-01-17 15:13:00 +01:00
Anton
f6fe827326 Improve microinteractions in experiment table [SCI-7540] 2023-01-17 13:40:30 +01:00
aignatov-bio
8a4599bed1
Merge pull request #4831 from aignatov-bio/ai-sci-7722-fix-new-task-modal-error-handling 
Fix error handling new task modal and completed task duplication [SCI-7722][SCI-7730]
 2023-01-17 13:34:13 +01:00
Oleksii Kriuchykhin
e20001dddb Fix tags editing for archived tags [SCI-7743] 2023-01-16 15:03:33 +01:00
Anton
3eb18a7cf4 Fix error handling new task modal and completed task duplication[SCI-7722][SCI-7730] 2023-01-16 13:03:25 +01:00
Anton
e41238a590 Update comments in canvas [SCI-7742] 2023-01-16 12:40:44 +01:00
sboursen-scinote
6c52ba70fc Make the state of the my-module-selector checkbox to unchecked for all renaming methods [SCI-7745] 2023-01-14 17:17:41 +01:00
sboursen-scinote
9f65073b0d Fix: pressing enter results in error in rename task modal [SCI-7745] 2023-01-14 10:52:31 +01:00
ajugo
78b4e71d3e
Remove double tooltip on task with cloning in progress [SCI-7762] (#4821) 2023-01-13 15:34:58 +01:00
artoscinote
80eb1639bc
Merge pull request #4823 from scinote-eln/features/tiny_mce_6 
Features/tiny mce 6
 2023-01-13 13:53:03 +01:00
artoscinote
aceedd0a14
Merge pull request #4818 from G-Chubinidze/gc_SCI_7651 
no results state updates [SCI-7651]
 2023-01-13 11:58:26 +01:00
Giga Chubinidze
f7fe30fdae no results state updates 2023-01-13 14:49:58 +04:00
artoscinote
f6be79d070
Merge pull request #4796 from G-Chubinidze/gc_SCI_7651 
Missing experiment table empty state [SCI-7651]
 2023-01-13 09:28:18 +01:00
ajugo
b8e5c98210
Canvas updates - actions and Create task modal [SCI-7723] (#4809) 2023-01-12 13:30:55 +01:00
Martin Artnik
3e65ae921c Fix TinyMCE blocking turbolinks [SCI-7729] 2023-01-12 12:09:44 +01:00
aignatov-bio
65624fa6ed
Merge pull request #4801 from aignatov-bio/ai-sci-7740-remove-task-access-button-from-action-toolbar 
Remove task access button from action toolbar [SCI-7740]
 2023-01-12 11:59:48 +01:00
aignatov-bio
aa02945bc7
Merge pull request #4799 from aignatov-bio/ai-sci-7708-fix-long-task-names-in-experiment-table 
Fix long task names in experiment table [SCI-7708]
 2023-01-12 11:58:11 +01:00
ajugo
b7077b53b7
Fix double loading of the experiment table view [SCI-7706] (#4804) 2023-01-12 11:33:57 +01:00
Martin Artnik
b559352128 Remove TinyMCE draft auto init functionality [SCI-7729] 2023-01-11 15:31:14 +01:00
Anton
2fd90a4e5f Remove task access button from action toolbar [SCI-7740] 2023-01-11 14:04:03 +01:00
Anton
a88adbf020 Fix long task names in experiment table [SCI-7708] 2023-01-11 13:37:24 +01:00
Giga Chubinidze
5ed3a22539 timing issue fixes 2023-01-11 12:15:25 +04:00
aignatov-bio
7503bd7af8
Merge pull request #4793 from aignatov-bio/ai-sci-7704-experiment-update-navigation-panel-along-with-table 
Update sidebar along with experiment table [SCI-7704]
 2023-01-10 14:56:04 +01:00
Anton
e38c45314b Update sidebar along with experiment table [SCI-7704] 2023-01-10 13:45:15 +01:00
Anton
ba442babe2 Update tag creation option design [SCI-7698] 2023-01-10 13:07:10 +01:00
aignatov-bio
d5bd26a31b
Merge pull request #4787 from aignatov-bio/ai-sci-7540-micro-interactions-fixes 
Micro interactions fixes [SCI-7540]
 2023-01-10 12:12:44 +01:00
Anton
b710d15831 Micro interactions fixes [SCI-7540] 2023-01-10 12:08:26 +01:00
artoscinote
3ce601dfa7
Merge pull request #4778 from artoscinote/ma_SCI_7382 
Add duplicating tooltips [SCI-7382]
 2023-01-10 11:56:33 +01:00
ajugo
06cdeb2d61
Prevent double click on button new experiment [SCI-7707] (#4783) 2023-01-10 11:46:32 +01:00
Martin Artnik
19b282cba2 Merge branch 'develop' into features/tiny_mce_6 2023-01-10 11:13:23 +01:00
ajugo
1fe39a216c
Fix tag display in experiment table for viewer role [SCI-7696] (#4781) 2023-01-10 11:09:23 +01:00
ajugo
dd0ede1c87
Remove selected rows after task renaming in experiment table view [SCI-7647] (#4775) 2023-01-10 11:08:30 +01:00
ajugo
9f6887ddcc
Fix step element reordering at importing protocol [SCI-7529] (#4677) 2023-01-09 16:08:27 +01:00
Martin Artnik
d4326c08db Add duplicating tooltips [SCI-7382] 2023-01-09 12:40:00 +01:00
ajugo
92e044dfd3
Fix locked task duplication [SCI-7682] (#4773) 2023-01-09 09:52:34 +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
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
artoscinote
9914f19634
Merge pull request #4760 from G-Chubinidze/gc_SCI_7651 
Missing experiment table empty state, fix breadcrumbs [SCI-7651]
 2023-01-06 10:51:34 +01:00
Giga Chubinidze
79c7e6f0a2 Missing experiment table empty state, fix breadcrumbs [SCI-7651] 2023-01-06 11:40:41 +04:00
aignatov-bio
d995019efa
Merge pull request #4758 from aignatov-bio/ai-sci-7687-fix-columns-during-sorting 
Fix placeholder columns during sorting [SCI-7687]
 2023-01-05 17:27:26 +01:00
aignatov-bio
d0fd4e1cbf
Merge pull request #4757 from aignatov-bio/ai-sci-7681-microinteractions-edit-experiment-name-field 
Add microinteractions to edit experiment name field [SCI-7681]
 2023-01-05 17:27:15 +01:00
Anton
00d8e2dd63 Fix placeholder columns during sorting [SCI-7687] 2023-01-05 13:10:51 +01:00
Anton
637a53cbc6 Add microinteractions to edit experiment name field [SCI-7681] 2023-01-05 12:43:19 +01:00
ajugo
f8d2edc2c8
Fix Manage access in the experiment table view [SCI-7648] (#4752) 2023-01-05 12:00:33 +01:00
ajugo
32e9329bcc
Fix user assign modal in experiment archived table view [SCI-7654] (#4742) 2023-01-05 12:00:12 +01:00
ajugo
194c519a9b
Fix experiment table due date initialization [SCI-7649] (#4730) 
* Fix experiment table due date initialization [SCI-7649]

* Fix due date overflow [SCI-7649]
 2023-01-05 11:14:34 +01:00
Martin Artnik
4e779e70a4 Merge branch 'develop' into features/tiny_mce_6 2023-01-04 14:21:02 +01:00
Anton
ba98075690 Add protocols filters front end [SCI-7517] 2023-01-04 10:34:49 +01:00
aignatov-bio
eaa7928617
Merge branch 'develop' into ai-sci-7167-update-repository-project-logic 2023-01-04 10:08:38 +01:00
ajugo
4f55b4a749
Fix advanced filters on PET tables [SCI-7650] (#4747) 2023-01-04 09:59:05 +01:00
Anton
9c488d5a0c Add new access user modal [SCI-7518] 2023-01-03 14:43:03 +01:00
ajugo
ae55935002
Add missing microinteractions on step editing [SCI-7575] (#4711) 2023-01-03 12:25:22 +01:00
Anton
031ba603fc Update tags selection [SCI-7645] 2022-12-22 17:39:51 +01:00
aignatov-bio
ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
ajugo
2920dca900
Clear row selection after experiment table reload [SCI-7647] (#4731) 2022-12-22 13:30:27 +01:00
aignatov-bio
7437af540b
Merge pull request #4701 from okriuchykhin/ok_SCI_7516 
Add versions and access columns to protocols table, update protocol model [SCI-7516]
 2022-12-21 13:03:38 +01:00
G-Chubinidze
f463664885
Merge pull request #4724 from G-Chubinidze/gc_SCI_7449 
FE | BE Add new task modal field for Tags [SCI-7449]
 2022-12-20 15:50:15 +04:00
Giga Chubinidze
377872dda3 hound code cleanup 2022-12-20 10:37:40 +04:00
Oleksii Kriuchykhin
5fea4722ac Add versions and access columns to protocols table, update protocol model [SCI-7516] 2022-12-19 15:39:32 +01:00
ajugo
5ab804c35a
Implement general protocol repository toolbar [SCI-7557] (#4698) 
* Implement general protocol repository toolbar [SCI-7557]

* Move protocolsio page [SCI-7557]
 2022-12-19 13:18:24 +01:00