scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
13145 commits 70 branches 179 tags 165 MiB
Commit graph

508 commits

Author SHA1 Message Date
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
Martin Artnik 27e34ab407 Track user full name update in navigation [SCI-8315] 2023-05-09 15:21:07 +02:00
Anton 5ec202e2c4 Update protocol top toolbar [SCI-8386] 2023-05-09 14:59:43 +02:00
G-Chubinidze 82d0657593
Merge branch 'features/navigation-refactor-v2' into gc_SCI_8389 2023-05-09 13:41:51 +04: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
sboursen-scinote 852e0eba42 Remove unused code [SCI-8250] 2023-05-08 12:52:57 +02:00
sboursen-scinote 32297c3312 Use fixed position for select option and add a fix for modals [SCI-8250] 2023-05-08 11:05:22 +02:00
Andrej 97bde133a8 Fix plate template JSON creation [SCI-8082] 2023-05-08 10:25:50 +02:00
sboursen-scinote d6a3da2c6f Fix hound [SCI-8250] 2023-05-08 09:57:31 +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
Giga Chubinidze f680fc43b9 Navigator elements not displaying tooltips on hover [SCI-8389] 2023-05-08 01:52:05 +04:00
Anton f48e09786e New color mapping [SCI-8339] 2023-05-05 14:05:17 +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
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
ajugo d92a9d62b3
Fix opening of the step reorderable modal [SCI-8364] (#5358) 2023-05-04 09:48:59 +02: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
aignatov-bio 7a40a7d13f
Merge pull request #5355 from aignatov-bio/ai-sci-color-fix-for-tailwind 
Color fix for tailwind
 2023-04-28 11:24:25 +02:00
Anton 2305fa91a3 Fix colors for tailwind 2023-04-28 10:55:58 +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
Anton 1bc2baf1f3 Add navigator interactions [SCI-8047] 2023-04-26 10:34:02 +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 413a65972b
At click away to another page save input to step table [SCI-8096] (#5257) 
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
 2023-04-25 14:33:32 +02:00
Anton 3724c38e7d Add archived state for navigator [SCI-8056] 2023-04-25 13:57:29 +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
Martin Artnik 7af146a580 Fix team dropdown on automatic team change [SCI-8352] 2023-04-21 12:25:42 +02:00
artoscinote 103ce8e70d
Merge pull request #5331 from scinote-eln/develop 
Merge develop
 2023-04-20 13:31:46 +02:00
Anton 7143c3ed5d Add general layout for navigator [SCI-8046 
]
 2023-04-19 14:19:55 +02: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
Anton 265272f212 Fix marvin js icon 2023-04-18 14:09:41 +02:00
Martin Artnik cccb5cd54e Fix display of special characters in teams dropdown [SCI-8323] 2023-04-18 11:59:00 +02:00
Anton 1526553467 Small fixes for notificaitions [SCI-8331] 2023-04-17 15:23:52 +02:00
aignatov-bio 18590b502d
Merge pull request #5309 from aignatov-bio/ai-sci-8325-fix-date-sorting-in-notifications 
Fix date sorting in notifications [SCI-8325]
 2023-04-17 11:23:37 +02:00
ajugo b62f1f5405
Add missing flash messages [SCI-8247] (#5308) 2023-04-14 15:10:35 +02:00
Anton c990301f1b Fix date sorting in notifications [SCI-8325] 2023-04-14 14:46:57 +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
artoscinote dd97a83de1
Merge pull request #5303 from G-Chubinidze/gc_SCI_7459 
Not saved checklist item at pasting text [SCI-7459]
 2023-04-14 10:28:38 +02:00
sboursen-scinote 4783ffcc4f Fix the issue with the published version number and refactor the code [SCI-8237] 2023-04-14 09:56:35 +02:00
Giga Chubinidze 5fa59ec2a0 Not saved checklist item at pasting text [SCI-7459] 2023-04-13 21:58:49 +04:00
aignatov-bio cbd84b94b4
Merge pull request #5288 from aignatov-bio/ai-sci-8280-add-counters-logic-to-notifications 
Add counters logic for notifications [SCI-8280]
 2023-04-13 15:35:56 +02:00
Anton cb7f41e516 Add counters logic for notifications [SCI-8280] 2023-04-13 15:35:21 +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 3ad5b779c4
Merge pull request #5298 from aignatov-bio/ai-sci-8289-css-fixes-for-navigator 
Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309]
 2023-04-13 14:59:39 +02:00
Anton caf21959bd Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309] 2023-04-13 14:54:03 +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 0b76acbede Change the draft version to be the next one after the latest published [SCI-8237] 2023-04-11 16:29:12 +02:00
sboursen-scinote 0efeb1d4cb Add version number to publish modal [SCI-8237] 2023-04-11 15:04:14 +02:00
sboursen-scinote b1914468c9 Add version number to protocol details [SCI-8237] 2023-04-11 15:00:21 +02:00
Soufiane 0f8918e9f6
Revision notes written in version modal are not seen/saved [SCI-8279] (#5272) 
* Load latest protocol version comment in publish modal [SCI-8279]

* Check publish permission before updating the draft comment [SCI-8279]
 2023-04-11 12:50:14 +02:00
sboursen-scinote 910b67f881 Save protocol steps order when modal is hidden [SCI-8276] 2023-04-10 09:27:44 +02:00
Anton 7b40c305e8 Add infinite scroll to notifications flyout [SCI-8282] 2023-04-07 14:06:29 +02:00
ajugo 4961243731
Fix protocol dropdown options for the locked tasks and archived protocol template [SCI-8277] (#5264) 2023-04-06 16:29:19 +02:00
Oleksii Kriuchykhin 60579465ab Refactor user_notifications controller, remove unused code [SCI-8207] 2023-04-06 14:57:00 +02: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 a1cebecdcd
Merge pull request #5037 from G-Chubinidze/gc_SCI_7673 
Add office file to task step - reload file option shows plain html page [SCI-7673]
 2023-04-05 15:26:18 +02:00
artoscinote 47b7d1a1ca
Merge pull request #4999 from G-Chubinidze/gc_SCI_7935 
Rearrange of checklist items does not work after pasting several items at once [SCI-7935]
 2023-04-05 15:23:03 +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
G-Chubinidze 045220c657
Wrong error message for too long office file name [SCI-7949] (#5155) 
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
 2023-04-05 13:56:25 +02:00
Anton 0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
Giga Chubinidze 57d951a690 Change title for publishing draft [SCI-8232] 2023-03-30 20:30:49 +04:00
Anton ed1c4bcb69 Replace webpacker with jsbundling-rails [SCI-7926] 2023-03-30 13:39:57 +02:00
Oleksii Kriuchykhin 89a45d2b14 Merge branch 'hotfix/1.26.6.4' into develop 2023-03-29 10:39:51 +02:00
Oleksii Kriuchykhin ee7abc2912 Fix step table renaming [SCI-8216] 2023-03-28 16:03:45 +02:00
Oleksii Kriuchykhin 0beb64511d Fix saving of big tables on steps [SCI-8216] 2023-03-28 13:29:02 +02:00
Anton 1177eaae5b Add general notifiacitons flyout [SCI-8017] 2023-03-25 17:34:26 +01:00
Anton 854fc1764b Refactor left/top navigation [SCI-8055] 2023-03-22 14:08:21 +01:00
Oleksii Kriuchykhin cf599a8277 Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157] 2023-03-21 16:25:02 +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
Anton 5a242021e3 Fix handson table metadata issue [SCI-8138] 2023-03-16 12:02:20 +01:00
Soufiane bc900cd26d
Merge branch 'features/protocol_versioning' into sb_SCI-8108 2023-03-16 09:20:36 +01:00
sboursen-scinote d49a992dd4 Fix styles when protocol is published [SCI-8108] 2023-03-16 09:15:22 +01:00
ajugo 917269a8e9
Add micro-interactions for protocol repository modals [SCI-8091] (#5102) 2023-03-14 14:20:03 +01:00
G-Chubinidze 7881ffbd3d
Merge branch 'features/protocol_versioning' into gc_SCI_8058 2023-03-14 17:07:52 +04:00
ajugo 8acbf0b4f1
Fix revert protocol action for linked task changes [SCI-8110] (#5125) 2023-03-14 13:03:37 +01:00
Soufiane 7b93ced541
CSS: Protocol template - Details [SCI-8108] (#5131) 
* Fix spacing issue in protocol details [SCI-8108]

* Fix spacing issue in protocol datatable [SCI-8108]

* Match the styles of the authors and the keywords to figma [SCI-8108]

* Fix broken dropdown footer [SCI-8108]

* Fix hound [SCI-8108]
 2023-03-14 12:54:13 +01:00
Giga Chubinidze 67539b15de Protocol permissions - button display [SCI-8058] 2023-03-14 12:12:54 +04:00
sboursen-scinote 4afac52ad3 Fix spacing issue in protocol datatable [SCI-8108] 2023-03-13 10:56:26 +01:00
Alex Kriuchykhin cb1c49762a
Revert "Protocol permissions - button display [SCI-8058]" (#5121) 2023-03-10 11:45:32 +01:00
G-Chubinidze f6ee2e821c
Merge pull request #5107 from G-Chubinidze/gc_SCI_8058 
Protocol permissions - button display [SCI-8058]
 2023-03-09 19:02:42 +04: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
G-Chubinidze 32d1c2cf6d
Merge branch 'features/protocol_versioning' into gc_SCI_8058 2023-03-08 21:15:36 +04:00
Giga Chubinidze 553c644811 Protocol permissions - button display [SCI-8058] 2023-03-08 21:12:29 +04:00
aignatov-bio ff4ef31ebf
Merge pull request #5091 from aignatov-bio/ai-sci-8079-fix-print-button-on-protocol-show-page 
Fix print protocol button on protocol show page [SCI-8079]
 2023-03-07 14:09:08 +01:00
G-Chubinidze 3cd4d9f760
Merge pull request #5077 from G-Chubinidze/gc_SCI_7954 
Archived protocol template navigation, icon, button [SCI-7954]
 2023-03-07 15:51:51 +04:00
Anton 25050cb6cc Fix print protocol button on protocol show page [SCI-8079] 2023-03-07 11:25:59 +01:00
Alex Kriuchykhin 0ab89db29c
Fix protocol Publish button behaviour after canceling of publish action [SCI-8068] (#5081) 2023-03-07 09:49:21 +01:00
Giga Chubinidze 4a02a130f0 Archived protocol template navigation, icon, button [SCI-7954] 2023-03-06 23:44:47 +04:00
ajugo 8b1bc51950
Fix loading of i icon on protocol [SCI-8051] (#5061) 2023-03-03 09:55:42 +01:00
Anton b68291c834 Fix protocol vue component loading [SCI-8024] 2023-03-02 11:33:40 +01:00