scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-24 17:06:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
13036 commits 69 branches 179 tags 165 MiB
Commit graph

2142 commits

Author SHA1 Message Date
Anton 66d21e9c4f Fix experiment cards views [SCI-7579] 2022-12-13 13:14:51 +01:00
Anton 6b6105dfe6 CSS fixes for exposed ID [SCI-7586] 2022-12-12 11:45:59 +01:00
aignatov-bio d596746893
Merge pull request #4702 from aignatov-bio/ai-sci-7581-fix-long-protocol-name-in-task-flyout 
Fix long protocol name in task protocol flyout [SCI-7581]
 2022-12-12 11:09:52 +01:00
aignatov-bio 66b0968b66
Merge pull request #4696 from aignatov-bio/ai-sci-7552-add-company-logo-to-label-templates 
Add logo to label templates [SCI-7552]
 2022-12-09 13:36:27 +01:00
Anton c5d91b061b Add logo to label templates 2022-12-09 13:33:10 +01:00
Martin Artnik de9f06a1fc Upgrade TinyMCE to 6.3, fix issues [SCI-7574] 2022-12-09 12:52:18 +01:00
Anton de35386f29 Fix long protocol name in task protocol flyout [SCI-7581] 2022-12-09 12:48:37 +01:00
Anton a3045a79a9 Fix expose ids css fixes [SCI-7578] 2022-12-09 09:59:51 +01:00
artoscinote a3e8000360
Merge branch 'develop' into features/exposed_ids 2022-12-08 15:58:11 +01:00
ajugo add6554732
Connect experiment options to the table view [SCI-7554] (#4692) 2022-12-07 14:51:48 +01:00
Martin Artnik c828d02b99 Merge branch 'develop' into features/tiny_mce_6 2022-12-07 14:07:43 +01:00
Anton 2a8aaed7d1 Add actions toolbar to protocol repository [SCI-7521] 2022-12-06 15:54:50 +01:00
Martin Artnik df4654189b Revert "Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]"" 
This reverts commit 50e7531ffa.
 2022-12-06 12:43:30 +01:00
Anton fdeb22c6cd Update protocols layout [SCI-7515] 2022-12-05 14:02:13 +01:00
ajugo 4b83f77c5b
Add new task modal field for Assign users for experiment views [SCI-7450] (#4670) 
* Add new task modal field for Assign users for experiment views [SCI-7450]

* Fix loading users assigned to the experiment [SCI-7450]

* Fix task creation on experiment if none exists [SCI-7450]
 2022-12-05 12:55:57 +01:00
ajugo 02f039ffed
Implement sorting for experiment table view [SCI-7451] [SCI-7497] (#4659) 
* Implement experiment table sort flyout [SCI-7451]

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

* Fix hound [SCI-7451]

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

* Fix hound [SCI-7451]
 2022-12-05 10:30:20 +01:00
G-Chubinidze 756e81c091
Merge pull request #4588 from G-Chubinidze/gc_SCI_7176 
expose experiment ids in active / archived card views [SCI-7176] [SCI-7202]
 2022-12-02 20:16:40 +04:00
G-Chubinidze df4ac4d5b3
Merge pull request #4429 from G-Chubinidze/gc_SCI_7172 
Expose project IDs in tables & cards view [SCI-7172]  [SCI-7173] [SCI-7201]
 2022-12-02 20:16:05 +04:00
Giga Chubinidze eff5d12253 removed last-page class by default 2022-12-02 20:10:03 +04:00
aignatov-bio cd0af24a24
Merge pull request #4676 from aignatov-bio/ai-sci-7525-experiment-table-connect-actions-to-context-menu 
Experiment table connect task action in dropdown [SCI-7525]
 2022-12-02 13:36:01 +01:00
Giga Chubinidze 76884bafc1 code cleanup 2022-12-02 15:53:22 +04:00
Giga Chubinidze 36b99fa2cb code cleanup 2022-12-02 14:51:22 +04:00
ajugo 7525ffeede
Add IDs to task cards in the canvas edit mode [SCI-7523] (#4666) 2022-12-02 11:40:57 +01:00
ajugo 8ff822c7e5
Implement due date column in experiment table view [SCI-7406] (#4646) 
* Implement due date column in experiment table view [SCI-7406]

* Fix due date [SCI-7406]

* Move text to translation [SCI-7406]

* Fix table due date partial [SCI-7406]

* Fix table due date partial [SCI-7406]
 2022-12-02 11:01:40 +01:00
Anton 12f141b82e Experiment table connect task action in dropdown [SCI-7525] 2022-12-02 10:03:01 +01:00
artoscinote 4664ef1d9b
Implement task cloning in experiments table [SCI-7382] (#4653) 
* Implement task cloning in experiments table [SCI-7382]

* Fix provisioning status polling [SCI-7382]

* Remove unused method [SCI-7382]

* Fix linter issues [SCI-7382]

* Fix fetching last clone number [SCI-7382]

* Fixing experiment duplication [SCI-7382]

* Add truncation to cloned name [SCI-7382]

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

* Move 'Clone' to translations, simplify JS [SCI-7382]
 2022-12-01 15:08:59 +01:00
Anton 234c4dfaeb Finish user assignment for experiment table [SCI-7510] 2022-11-30 15:04:02 +01:00
Anton 393bc03d47 CSS update for protocol import screen [SCI-7394] 2022-11-29 15:41:57 +01:00
aignatov-bio 7ea57d9ffe
Merge pull request #4630 from aignatov-bio/ai-sci-7440-add-dropdown-for-assigned-user-experiment-table 
Add user assignments dropdown for experiment table [SCI-7440]
 2022-11-29 15:32:00 +01:00
ajugo ea7f447190
Fix ovelaping checkbox on experiment card view [SCI-7546] (#4663) 2022-11-29 15:08:47 +01:00
aignatov-bio 887b1b062a
Merge pull request #4652 from aignatov-bio/ai-sci-7493-update-archived-my-modules-card-screen 
Update archive module cards header [SCI-7493]
 2022-11-29 14:04:30 +01:00
Anton bd77433fce Add user assignments dropdown for experiment table [SCI-7440] 2022-11-29 13:42:39 +01:00
ajugo 9c88a34d99
Implement empty and loader for canvas view navigator [SCI-7445] (#4651) 2022-11-28 10:35:42 +01:00
Anton e2cd0dfd91 Update archive module cards header [SCI-7493] 2022-11-25 15:29:15 +01:00
ajugo 80f66736b6
Add new task modal for experiment table view [SCI-7448] (#4638) 
* Add new task modal for experiment table view [SCI-7448]

* Fix placeholder and size of the icon [SCI-7448]

* Reload experiment table [SCI-7448]
 2022-11-24 14:49:42 +01:00
Anton 2e2086a03b Add archived view for experiment table [SCI-7452] 2022-11-24 12:07:52 +01:00
aignatov-bio c2be99abda
Merge pull request #4595 from aignatov-bio/ai-sci-7359-fix-select-time-layout 
Fix time picket CSS [SCI-7359]
 2022-11-24 09:44:12 +01:00
artoscinote 5605c3dfed
Merge pull request #4644 from aignatov-bio/ai-sci-7446-experiment-table-task-flyout-menu 
Add menu to experiment table row [SCI-7446]
 2022-11-23 16:48:20 +01:00
Anton 440800537c Add menu to experiment table row [SCI-7446] 2022-11-23 15:05:13 +01:00
Martin Artnik c21152b2e2 Add protocol ID to linked protocol dropdown [SCI-7204] 2022-11-23 11:49:53 +01:00
Anton e940bf8c0e Small canvas edit mode changes [SCI-7387] 2022-11-22 13:08:56 +01:00
Anton 98e87a2f4b Fix markup [SCI-7359] 2022-11-22 11:29:57 +01:00
Alex Kriuchykhin d6728ef9d3
Merge pull request #4597 from rekonder/aj_SCI_7361 
Fixed external protocol icon out of body [SCI-7361]
 2022-11-22 10:56:55 +01:00
Alex Kriuchykhin dc9831d3bc
Merge pull request #4568 from rekonder/aj_SCI_7181 
Remove old step code [SCI-7181]
 2022-11-22 10:52:06 +01:00
ajugo f2a680d826
Fix zebra printer print status [SCI-7474] (#4625) 2022-11-21 16:55:03 +01:00
Oleksii Kriuchykhin 49fbc2c561 Add basic modal for direct task creation [SCI-7197] 2022-11-18 17:00:11 +01:00
Giga Chubinidze 44d74b5797 refactoring projects scss 2022-11-17 22:29:15 +04:00
Giga Chubinidze 7f09fb8997 Archived projects cards and table updates [SCI-7201] 2022-11-17 22:25:54 +04:00
Anton 85c00c61e0 Add table columns display modal to experiment table [SCI-7441] 2022-11-16 09:54:12 +01:00
G-Chubinidze e3b9314646
Update my_modules.scss 2022-11-11 12:48:22 +04:00
Giga Chubinidze 5a429549da archived tasks updates [SCI-7203] 2022-11-11 12:45:07 +04:00
aignatov-bio 4b6ab3bd25
Merge pull request #4544 from aignatov-bio/ai-sci-7233-fix-login-signup-forms 
Fix css issues for login and signup forms [SCI-7233]
 2022-11-10 11:15:03 +01:00
aignatov-bio 2c17c05c7d
Merge pull request #4260 from artoscinote/ma_SCI_6982 
Implement multiline editing in repositories [SCI-6982][SCI-6983]
 2022-11-10 11:07:30 +01:00
artoscinote 0994c4a25b
Merge branch 'develop' into ma_SCI_6982 2022-11-10 11:04:57 +01:00
aignatov-bio 0ee586a394
Merge pull request #4439 from rekonder/aj_SCI_7027 
Session end implementation [SCI-7027]
 2022-11-10 11:03:02 +01:00
Anton a17cd78c20 Add view dropdown to experiment screen 2022-11-08 16:39:52 +01:00
Anton 7ceb94ab1f Add toolbar to experiment table [SCI-7379] 2022-11-08 12:52:49 +01:00
ajugo dd22d53bda
Implemented pagination for experiment table [SCI-7214] (#4591) 
* Implement pagination for experiment table [SCI-7214]

* Fix table experiment pagination [SCI-7214]

* Move pagination to service [SCI-7214]
 2022-11-07 11:46:54 +01:00
Andrej a88d41ca6a Fixed external protocol icon out of body [SCI-7361] 2022-11-07 11:03:34 +01:00
Anton b3bd165d01 Fix time picket CSS [SCI-7359] 2022-11-04 11:36:21 +01:00
Giga Chubinidze d1aa127b7a Merge branch 'features/exposed_ids' of github.com:scinote-eln/scinote-web into gc_SCI_7176 2022-10-28 15:30:28 +04:00
Giga Chubinidze a9287df1a0 exposed experiment ids on card view page / other styling updates [SCI-7176] 2022-10-28 15:16:49 +04:00
G-Chubinidze 81c5978805
Merge branch 'features/exposed_ids' into gc_SCI_7172 2022-10-28 15:05:38 +04:00
Giga Chubinidze fe488ed00f fixed unstable project name and code styling in cards 2022-10-28 11:38:38 +04:00
Giga Chubinidze b1296adeb3 pitstop 2022-10-28 10:49:13 +04:00
ajugo 29ce28a1af
Implement canvas view navigator [SCI-7198] (#4577) 2022-10-27 14:43:31 +02:00
ajugo bdf56ea2a1
Add comments to the experiment table view [SCI-7217] (#4583) 2022-10-27 14:41:35 +02:00
Anton c2338d677d Fix label preview height in print modal [SCI-7410] 2022-10-27 12:13:25 +02:00
ajugo fedaf703d4
Add view button to experiment title bar [SCI-7216] (#4579) 2022-10-27 09:53:01 +02:00
ajugo 58bca40632
Change zebra label instructions [SCI-7390] (#4572) 2022-10-25 11:44:50 +02:00
Anton 8feaedc0d1 Add core columns to experiment table [SCI-7212] 2022-10-24 15:27:57 +02:00
Andrej 745be5a0f7 Remove old step code [SCI-7181] 2022-10-24 13:07:10 +02:00
Anton bc86f11404 Add experiment table view [SCI-7174] 2022-10-21 12:22:38 +02:00
Anton ac0fe4389d Fix label preview in print modal [SCI-7367] 2022-10-20 10:57:40 +02:00
ajugo 3a0eec7043
Fix button shrink for inventory toolbar [SCI-7252] (#4551) 2022-10-19 18:09:59 +02:00
Anton 2ae8943d80 Update general canvas layout [SCI-7196] 2022-10-19 11:46:16 +02:00
Anton 689c34e54d Fix css issues for login and signup forms [SCI-7233] 2022-10-18 11:54:10 +02:00
Giga Chubinidze 62febd44dd centered project code for tables 2022-10-13 20:31:37 +04:00
Giga Chubinidze f7472d25b9 more styling fixes 2022-10-07 17:14:43 +04:00
Giga Chubinidze 3f3c2a3504 project name card size change 2022-10-07 15:27:33 +04:00
ajugo 7fbac92f9c
Add status for Zebra printers in label print modal [SCI-7269] (#4492) 2022-10-04 09:57:47 +02:00
Oleksii Kriuchykhin b20c2b13a3 Fix label printers dropdown on print modal [SCI-7258] 2022-10-03 10:37:04 +02:00
aignatov-bio 13f24cac08
Merge pull request #4483 from aignatov-bio/ai-sci-7262-css-fixes-label-templates 
CSS fixes for label templates [SCI-7262]
 2022-09-30 09:47:39 +02:00
ajugo 69bc48fef8
Add cancel button and fix number input [SCI-7274] (#4478) 2022-09-29 14:45:10 +02:00
Anton 9dc667f8e1 CSS fixes for label templates [SCI-7262] 2022-09-29 14:09:16 +02:00
aignatov-bio d9dc76c0f9
Merge pull request #4476 from aignatov-bio/ai-sci-7259-label-printer-modal-add-icons-template 
Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260]
 2022-09-29 13:56:39 +02:00
artoscinote d08838bf48
Merge branch 'develop' into master_1_26_0_5 2022-09-29 10:12:29 +02:00
Anton 7e06f29a75 Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260] 2022-09-28 11:34:24 +02:00
aignatov-bio 31554d0fd9
Merge pull request #4472 from aignatov-bio/ai-sci-7255-add-label-validation-to-print-modal 
Add label validation and preview in print modal [SCI-7255][SCI-7256]
 2022-09-28 11:32:39 +02:00
Anton 3773fff093 Add label validation and preview in print modal [SCI-7255][SCI-7256] 2022-09-27 15:46:48 +02:00
Anton d22ec4960d Add loading label to settings printers search [SCI-7253] 2022-09-27 12:02:50 +02:00
aignatov-bio e96b15b241
Merge pull request #4444 from aignatov-bio/ai-sci-7222-update-fluics-template-screen 
Update fluics view and permissions for label templates [SCI-7222]
 2022-09-26 10:22:01 +02:00
ajugo a3ea6e608c
Add validation to print modal and implement zpl printing [SCI-7052][SCI-7221] (#4448) 
* Add validation to print modal [SCI-7052]

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

* Fix hound [SCI-7052]

* Rename validation endpoint [SCI-7052]

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

* Fix hound [SCI-7221]
 2022-09-22 15:06:36 +02:00
Anton 9bc4610cae Fix checkbox in safari [SCI-7239] 2022-09-22 11:24:02 +02:00
Anton 2d925a3bfe Add help and quick toolbar plugin to tinymce [SCI-7190] 2022-09-21 12:01:08 +02:00
artoscinote 50e7531ffa
Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]" 2022-09-21 10:07:44 +02:00
Anton 07f0142789 Fix links in locked step texts elements [SCI-7224] 2022-09-20 15:44:52 +02:00
Anton fed1228adc Update fluics and permissions for label templates [SCI-7222] 2022-09-20 12:59:58 +02:00
aignatov-bio e524355207
Merge pull request #4441 from aignatov-bio/ai-sci-7210-add-code-validation-to-label-templates 
Add validation to label template code [SCI-7210]
 2022-09-20 11:59:59 +02:00
artoscinote cf3a233f4e
Merge branch 'develop' into ma_SCI_7177 2022-09-19 13:58:33 +02:00
Anton 17bf490fef Add validation to label template code [SCI-7210] 2022-09-19 11:59:36 +02:00
Andrej ec77c2a076 Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7027 2022-09-16 10:44:07 +02:00
Andrej 4fb3f7ff3d Fix hound and add emoji in title [SCI-7027] 2022-09-16 10:39:39 +02:00
Andrej ac7c873385 Session end implementation [SCI-7027] 2022-09-16 09:57:40 +02:00
Giga Chubinidze 102eed8241 Expose project IDs in tables & cards view [SCI-7172] [SCI-7173] 2022-09-15 22:27:23 +04:00
Giga Chubinidze b31f60026a Expose project IDs in tables & cards view [SCI-7172] [SCI-7173] 2022-09-15 22:20:04 +04:00
artoscinote 500adb346e
Merge pull request #4426 from G-Chubinidze/gc_SCI_7115 
added scrollbar to task paper dropdown [SCI-7115]
 2022-09-15 15:29:25 +02:00
Anton 0c596bb701 Merge branch 'develop' into features/label-templates 2022-09-15 10:40:17 +02:00
Martin Artnik 3d1bdac1f4 Added task code to task details [SCI-7178] 2022-09-13 13:17:18 +02:00
Martin Artnik b836b9a12b Add task IDs to canvas view [SCI-7177] 2022-09-13 12:42:12 +02:00
Giga Chubinidze 2c393a1bef exposed prefixed ids for projects table [SCI_7172] 2022-09-13 13:31:04 +04:00
Giga Chubinidze fbbe394029 exposed prefixed ids for projects table [SCI_7172] 2022-09-13 13:24:06 +04:00
Giga Chubinidze 271867710f added scrollbar to task paper dropdown [SCI-7115] 2022-09-09 23:28:37 +04:00
Anton 73917ec4c0 Fix tinymce errors [SCI-7182] 2022-09-09 15:50:59 +02:00
artoscinote 6a2037dc00
Fix smart annotations in locked elements [SCI-7135] (#4421) 2022-09-09 11:15:33 +02:00
aignatov-bio 7d9fbb45d5
Merge branch 'features/tiny_mce_6' into ai-sci-7152-update-tinymce-image-toolbar-plugin 2022-09-08 12:13:58 +02:00
Anton 2f01a5a358 Update tinymce placeholder plugin [SCI-7153] 2022-09-07 15:16:03 +02:00
Anton c8af3e1fa8 Update tinymce image toolbar plugin [SCI-7152] 2022-09-07 11:24:54 +02:00
artoscinote 44b7c866b5
Move tinymce to webpacker and upgrade to v6 [SCI-7081] (#4385) 
* Move tinymce to webpacker and upgrade to v6 [SCI-7081]

* Cleanup and refactor [SCI-7081]

* Clean up legacy plugins [SCI-7150]

* Linter fix [SCI-7081]]
 2022-09-05 11:29:19 +02:00
aignatov-bio 491ff286f6
Merge pull request #4390 from aignatov-bio/ai-sci-7113-fix-assigned-repositry-bell-flyout 
Fix bell flyout in assigned repository [SCI-7113]
 2022-09-02 11:21:17 +02:00
aignatov-bio 2e190510c4
Merge pull request #4397 from aignatov-bio/ai-sci-7136-fix-rte-toolbar-position 
Fix rte toolbar position [SCI-7136]
 2022-09-02 11:20:32 +02:00
aignatov-bio e605471269
Merge pull request #4392 from aignatov-bio/ai-sci-7100-fix-inivitation-modal 
Invite user modal fixes [SCI-7100]
 2022-09-02 11:20:18 +02:00
Anton 312f2a1357 Fix rte toolbar position [SCI-7136] 2022-08-31 13:15:08 +02:00
aignatov-bio 57282069e9
Merge pull request #4361 from aignatov-bio/ai-sci-7084-add-sorting-by-default-template 
Add sorting by default label template [SCI-7084]
 2022-08-31 10:36:02 +02:00
aignatov-bio 17d69131f3
Merge pull request #4383 from aignatov-bio/ai-sci-7124-fix-old-tinymce-big-tables 
Fix overflow issue on step text [SCI-7124]
 2022-08-31 10:13:27 +02:00
Martin Artnik d3665a940e Fix smart annotations for locked tasks [SCI-7135] 2022-08-31 09:49:47 +02:00
Anton 0862221345 Invite user modal fixes [SCI-7100] 2022-08-29 14:01:31 +02:00
Anton d2639d4633 Fix bell flyout in assigned repository [SCI-7113] 2022-08-29 11:30:39 +02:00
ajugo 185bf0b197
Add label template dropdown to print dialog [SCI-7051] (#4369) 2022-08-26 10:53:55 +02:00
Anton 0747a495c9 Fix overflow issue on step text [SCI-7124] 2022-08-25 15:32:03 +02:00
Anton 9daa3f6d69 Fix css for label view page [SCI-7085] 2022-08-25 13:25:34 +02:00
Anton 771c40d4f0 CSS fixes for label template screen [SCI-7085] 2022-08-24 17:57:34 +02:00
aignatov-bio 6d8908c1f5
Merge branch 'features/label-templates' into ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor 2022-08-24 17:48:48 +02:00
artoscinote 7a7df03396
Implement label preview component [SCI-7050] (#4370) 2022-08-24 13:55:54 +02:00
artoscinote c2242b6cc8
Amend how checkboxes work with locking [SCI-7122] (#4374) 2022-08-23 10:10:20 +02:00
Andrej 371f5e782b Remove strikethrough for step name and checklist items [SCI-7116] 2022-08-19 16:02:20 +02:00
Anton 46990b3df4 Add sorting by default label template [SCI-7084] 2022-08-18 11:49:22 +02:00
Anton 4f312bf329 Finalize insert field dropdown [SCI-7054] 2022-08-17 12:58:27 +02:00
Anton 1a13e1bfc6 Fix unexpected error on step attachments [SCI-7032] 2022-08-16 11:22:19 +02:00
Anton 174d33bba8 Add column dropdown to label template editor [SCI-7054] 2022-08-16 10:16:40 +02:00
ajugo 39fbb2a9a0
Fix office modal and protocol status [SCI-7064] (#4352) 2022-08-12 14:57:56 +02:00
ajugo 8dec17f606
Add print label button in view repository role [SCI-7097] (#4351) 2022-08-12 14:55:14 +02:00
artoscinote e4a7aa3dad
Add name prompt for tables with empty names [SCI-7082] (#4348) 
* Add name prompt for tables with empty names [SCI-7082]

* Move to separate component [SCI-7082]
 2022-08-12 10:17:45 +02:00
ajugo 12fc3b0b3b
Fix protocol repository issues [SCI-7003] (#4343) 
* Fix protocol repository issues [SCI-7003]

* Remove unnecessary inRepository [SCI-7003]
 2022-08-10 15:39:45 +02:00
artoscinote a37c236518
Inline edit and checklist improvements [SCI-7031] (#4340) 
* Inline edit and checklist improvements [SCI-7031]

* Fix smart annotations in inline edit [SCI-7031]
 2022-08-10 14:43:23 +02:00
ajugo b6f273410b
Fix protocol repository CSS [SCI-7064] (#4335) 
* Fix protocol repository CSS [SCI-7064]

* Fix protocol repository CSS [SCI-7064]

* Fix hound [SCI-7064]
 2022-08-10 10:27:15 +02:00
artoscinote c106c2d997
Add active reminders filter [SCI-7004] (#4280) 2022-08-09 10:23:40 +02:00
artoscinote 19d2fea4fe
Fix checkboxes [SCI-7057] (#4317) 2022-08-09 09:25:18 +02:00
Anton edbcbffae4 Fix protocol creation from dashboard [SCI-7075] 2022-08-08 11:26:12 +02:00
aignatov-bio e5448f3d1f
Merge pull request #4311 from aignatov-bio/ai-sci-7030-label-template-view-edit-screen 
Add general layout for template view screen [SCI-7030]
 2022-08-04 14:13:25 +02:00
Anton a38aa80fb5 Add main functionality to view/edit screen [SCI-7041] 2022-08-04 13:37:21 +02:00
ajugo b58e3cd4d8
Add zebra settings screen [SCI-7016] (#4310) 
* Add zebra settings screen [SCI-7016]

* Fix hound [SCI-7016]
 2022-08-04 11:14:35 +02:00
artoscinote 9478779218
TinyMCE fixes [SCI-7033] (#4308) 2022-08-04 11:06:25 +02:00
Anton 31202922af Add general layout for template [SCI-7030] 2022-08-04 10:51:30 +02:00
Anton 8c080ea04c Add promo page for label templates [SCI-7029] 2022-08-02 14:51:18 +02:00
ajugo 8222227712
Fix new step alignment and author list in protocols [SCI-6991] (#4304) 2022-08-02 12:22:29 +02:00
Anton c7b0d1d6f8 Small CSS task fixes [SCI-7032] 2022-08-02 11:00:13 +02:00
artoscinote 89a3bc8072
Checklist fixes [SCI-7031] (#4302) 2022-08-02 10:18:25 +02:00
Oleksii Kriuchykhin fcd0de80ca Fix long result names in PDF reports [SCI-6978] 2022-08-01 13:14:53 +02:00
Anton 67df01711f Add edit actions to label templates [SCI-7019] 2022-07-28 14:42:13 +02:00
aignatov-bio 0249f2a30e
CSS fixes for step attachments [SCI-7001] (#4294) 2022-07-28 09:56:09 +02:00
ajugo ad4f52d912
Add Label template list screen - view mode [SCI-7018] (#4292) 
* Initial label template datatable [SCI-7018]

* Add new columns to LabelTemplate and update datatable view [SCI-7018]

* Fix after rebase [SCI-7018]

* Fix migration, disable checkboxes in view mode and fix label template to team level [SCI-7018]
 2022-07-27 10:10:32 +02:00
artoscinote 2800274d7c
Fix table scroll in view mode [SCI-7021] (#4284) 2022-07-26 13:42:00 +02:00
aignatov-bio a2d72338ce
Merge pull request #4286 from aignatov-bio/ai-sci-6971-fix-comments-avatar-image 
Fix comments avatar image [SCI-6971]
 2022-07-26 13:36:42 +02:00
Anton 81b0fe3706 Fix comments avatar image [SCI-6971] 2022-07-25 13:38:36 +02:00
aignatov-bio 25b808532d
Merge pull request #4258 from aignatov-bio/ai-sci-6972-fix-viewer-role 
Fix step for viewer role [SCI-6972]
 2022-07-25 11:38:08 +02:00
Anton 3f82666619 Fix step for viewer role [SCI-6972] 2022-07-25 11:35:34 +02:00
artoscinote dabb600e6f
Fix rounded corners on text block [SCI-6996] (#4281) 2022-07-25 11:33:06 +02:00
Anton 70fe27f31b Allow multiline in checklist items [SCI-7008] 2022-07-25 11:21:31 +02:00
artoscinote 6f72777acd
Fix rounded corners on step elements [SCI-6996] (#4279) 2022-07-21 16:36:14 +02:00
artoscinote 5ec1002329
Simplify task locking logic on FE [SCI-6987] (#4278) 2022-07-21 15:49:03 +02:00
Alex Kriuchykhin b9d953b3a4
Fix pdf report styling and bookmarks [SCI-6978] (#4274) 2022-07-21 09:57:28 +02:00
artoscinote 28ca1aaec6
Disable checklist item drag for less than 2 items, fix base element controller [SCI-6997] (#4275) 2022-07-21 09:57:14 +02:00
artoscinote d0cc3155f1
Only activate overlay when dragging files [SCI-6997] (#4272) 2022-07-20 13:39:04 +02:00
artoscinote 088c4c1c94
Add hover state to step checkbox [SCI-6999] (#4271) 2022-07-20 12:24:43 +02:00
artoscinote 6367842e1e
Step table CSS fixes [SCI-6998] (#4270) 2022-07-20 12:07:25 +02:00
artoscinote 087ffb28c3
Step element header style fixes [SCI-6996] (#4268) 2022-07-20 10:14:23 +02:00
Martin Artnik 6227b1f5a1 Added edit overlays, disable more controls [SCI-6983] 2022-07-19 14:22:40 +02:00
Martin Artnik 98b3627219 Implement multiline editing in repositories [SCI-6982] 2022-07-19 12:24:33 +02:00
artoscinote b6b1fed7e2
Fix alignment of items in reorder modal [SCI-6995] (#4264) 2022-07-19 10:10:07 +02:00
artoscinote 0c42e029ae
Fix step title alignments [SCI-6994] (#4263) 
* Fix step title alignments [SCI-6994]

* Fix step serializer [SCI-6994]
 2022-07-19 10:09:33 +02:00
artoscinote 6b8ea376bc
CSS fix for file dropdown [SCI-6990] (#4261) 2022-07-19 10:09:19 +02:00
ajugo ca87d93cb3
Fix protocol metadata alignments [SCI-6991] (#4262) 2022-07-18 16:56:51 +02:00
ajugo 8172523f5a
Protocol alignment fixes [SCI-6988] (#4259) 
* Fix rendering protocol steps

* Fix empty space for step text [SCI-6988]

* Align step number and step name [SCI-6988]

* Align step number and step name [SCI-6988]
 2022-07-18 16:56:06 +02:00
ajugo ccf95fea24
Fix file block issues [SCI-6966] (#4244) 
* Fix bugs for step attachments [SCI-6966]

* Fix flickering on fast drag over of file [SCI-6966]

* Fix flickering on fast drag over of file [SCI-6966]

* CSS fixes, rearrange steps button hiding [SCI-6940][SCI-6934] (#4234)

* Hide rearange steps button when less than 2 steps [SCI-6934]

* Task status buttons CSS fix [SCI-6940]

* Fix microinteraction for table editing [SCI-6957] (#4236)

* Fix protocol elements allignments [SCI-6932]

* DOCX layout improvements [SCI-6857] (#4160)

* Fix edit step button [SCI-6938] (#4232)

* Clean storage usage check [SCI-6966]

Co-authored-by: artoscinote <85488244+artoscinote@users.noreply.github.com>
Co-authored-by: Anton <anton@scinote.net>
 2022-07-15 10:13:55 +02:00
aignatov-bio 63c54d9005
Merge pull request #4227 from aignatov-bio/ai-sci-6971-fix-step-comments 
Fix step comments [SCI-6971]
 2022-07-15 10:10:56 +02:00
ajugo bab466d908
Fix grip for checklist elemnt position [SCI-6961] (#4254) 2022-07-15 10:07:31 +02:00
ajugo c85612ee4e
Fix protocol template alignment and placeholders [SCI-6981] (#4253) 
* Fix protocol template alignment and placeholders [SCI-6981]

* Add placeholder text [SCI-6981]
 2022-07-15 10:00:50 +02:00
Alex Kriuchykhin 46cf62368d
Merge pull request #4229 from okriuchykhin/ok_SCI_6969 
Fix file upload and edit interactions on steps page [SCI-6969]
 2022-07-14 09:48:20 +02:00
ajugo 914516ac4c
Fix checklist item alignments and step edit alignment [SCI-6961] (#4242) 2022-07-13 21:02:21 +02:00
aignatov-bio 186f892288
Merge branch 'develop' into ai-sci-6970-step-rearranging-fixes 2022-07-13 18:03:03 +02:00
artoscinote c7ac9190c3
TinyMCE and styling fixes [SCI-6956][SCI-6952][SCI-6948] (#4241) 
* Also validate char count on paste in TinyMCE [SCI-6952]

* Fix new text tinymce init [SCI-6956]

* Fix step head styling [SCI-6952]

* Fix step dropdown icon [SCI-6948]
 2022-07-13 18:02:35 +02:00
Anton 496ade309c Step rearranging fixes [SCI-6970] 2022-07-13 15:17:32 +02:00
aignatov-bio b84e77210f
Merge pull request #4237 from aignatov-bio/ai-sci-6932-protocol-section-css-fixes 
Fix protocol elements alignments [SCI-6932]
 2022-07-13 12:42:22 +02:00
Anton cbeac82992 Fix protocol elements allignments [SCI-6932] 2022-07-13 12:37:57 +02:00
artoscinote 17eada574e
CSS fixes, rearrange steps button hiding [SCI-6940][SCI-6934] (#4234) 
* Hide rearange steps button when less than 2 steps [SCI-6934]

* Task status buttons CSS fix [SCI-6940]
 2022-07-13 10:47:12 +02:00
Oleksii Kriuchykhin 747e88fafc Fix file upload and edit interactions on steps page [SCI-6969] 2022-07-12 15:24:12 +02:00
Anton 8e8826d33c Fix step comments [SCI-6971] 2022-07-12 13:54:10 +02:00
Martin Artnik 99e5f7558a Fix CSS syntax error 2022-07-12 10:59:33 +02:00
artoscinote 765e5b99bd
Protocol editing CSS fixes [SCI-6940] (#4194) 2022-07-12 10:43:01 +02:00
aignatov-bio 3184647141
Merge pull request #4221 from aignatov-bio/ai-sci-6959-fix-step-content-blocks-allignment 
Fix elements step elements alignment [SCI-6959]
 2022-07-12 10:38:15 +02:00
aignatov-bio 67dbab97d9
Merge pull request #4220 from aignatov-bio/ai-sci-6944-change-core-colors 
Update accent colors [SCI-6944]
 2022-07-12 10:38:01 +02:00
Anton b5d67d429b Fix elements step elements alignment [SCI-6959] 2022-07-11 13:53:16 +02:00
Anton e472855690 Update accent colors [SCI-6944] 2022-07-11 12:00:13 +02:00
ajugo 045485ff45
Fix checklist item alignments and placeholder text [SCI-6961] (#4211) 2022-07-11 11:52:38 +02:00
ajugo 4db46eac44
Fix linked protocol naming and i flyout [SCI-6963] (#4213) 2022-07-11 11:29:05 +02:00
artoscinote cb113c4bdb
Change reordering icons [SCI-6953] (#4208) 2022-07-11 10:54:18 +02:00
artoscinote 5cb53c774c
Step header fixes [SCI-6948] (#4217) 2022-07-11 10:45:25 +02:00
artoscinote a51ce1c322
Fix text field error states [SCI-6952] (#4216) 2022-07-11 10:44:27 +02:00
Anton 972cc49389 Fix smart annotation for step editing [SCI-6939] 2022-07-08 12:51:43 +02:00
Anton 11b62cca7b Fix task page layout [SCI-6950] 2022-07-07 15:56:36 +02:00
Anton 4e2cb29f48 Fix step complete and name editing [SCI-6949] 2022-07-07 14:33:38 +02:00
aignatov-bio dce755b294
Merge pull request #4205 from aignatov-bio/ai-sci-6933-add-micro-interactions-to-step 
Fix microinteractions for step editing [SCI-6933]
 2022-07-07 09:15:19 +02:00
Anton b3d7c3ff75 Fix microinteractions for step editing [SCI-6933] 2022-07-06 14:31:55 +02:00
artoscinote c9e7e68369
Insert element dropdown fixes [SCI-6925] (#4184) 
* Insert element dropdown fixes [SCI-6925]

* Dropdown bugfix, rounder CSS size [SCI-6925]
 2022-07-06 14:11:48 +02:00
Anton 7b0853d00a CSS fixes for steps [SCI-6932] 2022-07-05 12:49:12 +02:00
Martin Artnik 910c36af08 Merge branch 'features/step-editing-improvements' into develop 2022-07-05 10:12:10 +02:00
artoscinote a0578e09bb
Fix tags modal css issue [SCI-6926] (#4182) 2022-07-04 13:54:54 +02:00
aignatov-bio 3a5492f875
Merge pull request #4168 from aignatov-bio/ai-sci-6862-fix-css-step-editing 
CSS fixes for step editing [SCI-6862]
 2022-06-27 11:13:18 +02:00
aignatov-bio bd1f65c811
Merge pull request #4171 from aignatov-bio/ai-sci-6921-add-delete-all-button 
Add delete all steps button [SCI-6921]
 2022-06-27 11:13:06 +02:00
Anton 1863e031c5 PDF report fixes [SCI-6924] 2022-06-24 14:38:24 +02:00
Anton 5296b50c2f Add delete all steps button [SCI-6921] 2022-06-24 11:21:47 +02:00
Anton a727fc0d68 Fix css for protocol repository [SCI-6862] 2022-06-21 18:20:52 +02:00
Anton 8d2154d653 CSS fixes for step editing [SCI-6862] 2022-06-21 11:32:27 +02:00
Anton 66212fd703 Finalize inline edit field [SCI-6782] 2022-06-09 14:40:45 +02:00
ajugo a5065b82cb
Show error for broken file in repository row [SCI-6838] (#4146) 2022-06-08 13:35:06 +02:00
Anton 46631a1f46 Finalize protocol repository [SCI-6870] 2022-06-07 12:10:10 +02:00
Anton 2da1a380c3 Add view mode to protocol and step [SCI-6867] 2022-06-03 11:53:53 +02:00
Martin Artnik 9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
aignatov-bio 6b4a3f2651
Merge pull request #4130 from aignatov-bio/ai-sci-6856-update-pdf-report 
Update PDF report layout [SCI-6856]
 2022-06-02 11:18:16 +02:00
Anton 61464b3780 Add new protocol view to repository [SCI-6858] 2022-06-02 11:05:25 +02:00
Anton b684841718 Update PDF report layout [SCI-6856] 2022-05-31 14:42:46 +02:00
artoscinote 3c63d9a3eb
CSS fix, routes fix [SCI-6844] (#4106) 2022-05-31 09:05:38 +02:00
artoscinote 23872f519b
Implement step element sorting modal [SCI-6849] (#4124) 
* Implement step element sorting modal [SCI-6849]

* Implement step reordering modal [SCI-6850]

* Refactor reorderable items a bit [SCI-6850]
 2022-05-30 13:45:51 +02:00
aignatov-bio 57408e9f4f
Merge pull request #4121 from aignatov-bio/ai-sci-6835-display-user-free-space 
Add the ability to show storage limit [SCI-6835]
 2022-05-26 15:03:45 +02:00
Anton 9e2c8bf25a Add ability to show storage limit [SCI-6835] 2022-05-26 14:48:57 +02:00
artoscinote 894eb8932d
Implement checklist item ordering [SCI-6847] (#4119) 2022-05-26 14:02:02 +02:00
aignatov-bio 45801950fd
Merge pull request #4116 from aignatov-bio/ai-sci-6814-add-dropable-area-to-step 
Add dropable area to step [SCI-6814]
 2022-05-26 12:57:51 +02:00
Anton 2ee5a31d3d Add dropable area to step [SCI-6814] 2022-05-26 12:57:12 +02:00
aignatov-bio 82a3a9de9a
Merge pull request #4090 from aignatov-bio/ai-sci-6810-add-tinymce-component-to-protocol-description 
Add tinyMce field to protocol [SCI-6810]
 2022-05-26 12:46:15 +02:00
Anton 7bc5c622a7 Add comments to step [SCI-6837] 2022-05-25 15:06:12 +02:00
ajugo b77394a7b2
Responsive filter flyout [SCI-6494] (#4098) 
* Responsive filter flyout [SCI-6494]

* Correct delimiter [SCI-6494]
 2022-05-25 10:42:54 +02:00
ajugo bacb1547f2
Changed clone permissions and UI changes for experiment actions [SCI-6756] (#4074) 2022-05-25 10:22:50 +02:00
artoscinote 6c797f5825
Integrate WOPI file modal with new steps [SCI-6830] (#4111) 2022-05-24 11:13:47 +02:00
Anton a494051f61 Add placeholder for new files in step [SCI-6833] 2022-05-23 13:44:34 +02:00
Anton 134558355d Add file modal [SCI-6828] 2022-05-18 11:12:53 +02:00
Anton 9aaf4a136e Add menu to attachment cards [SCI-6816] 2022-05-17 10:41:34 +02:00
Anton 711bd77222 Add manage dropdown to attachments section [SCI-6815] 2022-05-16 11:05:18 +02:00
ajugo 2097fb1df4
CSS fix overlapping number in task assigned items [SCI-6794] (#4092) 2022-05-13 11:16:07 +02:00
Anton 87450ea821 Add thumbnail and list view [SCI-6812] 2022-05-12 18:04:06 +02:00
Anton 6dce426db4 Add tinyMce field to protocol [SCI-6810] 2022-05-11 16:10:26 +02:00
artoscinote b486f3fd31
Implement checklists [SCI-6789] (#4089) 2022-05-11 15:51:26 +02:00
Anton 04e16cf6b5 Add text component [SCI-6808] 2022-05-11 09:51:47 +02:00
Anton 252680f0a1 Add table component [SCI-6777] 2022-05-06 12:09:54 +02:00
artoscinote b00968fd55
Implement basic checklist functionality [SCI-6786] (#4073) 
* Implement protocol status bar functionality [SCI-6760]

* Inline edit interactions, checklist name edit improvements [SCI-6786]
 2022-05-05 12:56:31 +02:00
artoscinote 5454aa26bc
Implement protocol status bar functionality [SCI-6760] (#4070) 2022-05-04 11:49:57 +02:00
artoscinote 6352a4dd04
Implement protocol options dropdown [SCI-6750, SCI-6751] (#4066) 
* Implement protocol options dropdown [SCI-6750, SCI-6751]

* Implement simple API error handling for step status update [SCI-6354]
 2022-05-03 15:18:48 +02:00
Anton 6a827022f6 Add insert step element dropdown [SCI-6758] 2022-05-03 13:22:26 +02:00
Anton 98efcc04b5 Small CSS fixes for repository [SCI-6767] 2022-04-28 14:32:34 +02:00
artoscinote 2515ed5a32
Add collapsing task status buttons [SCI-6721] (#4060) 2022-04-28 14:12:08 +02:00
Anton 189f4335ea Add main layout for step [SCI-6755] 2022-04-28 11:38:33 +02:00
Anton 6dde945d61 Add step layout [SCI-6755] 2022-04-28 11:13:38 +02:00
artoscinote 8aaab73856
Add inline edit component, protocol name updates [SCI-6749] (#4057) 2022-04-26 14:13:17 +02:00
Oleksii Kriuchykhin b148bd2057 Add results counter to secnd navigation [SCI-6722] 2022-04-22 12:24:14 +02:00
Anton df2ff32f2e Update general layout for task [SCI-6713] 2022-04-21 14:43:10 +02:00
Anton ed49e93a6a Highlight negative stock in modal with red [SCI-6729] 2022-04-15 12:08:29 +02:00
artoscinote 30ee6cd40c
Refactor and fix display of stock warnings and stock consumption [SCI-6734] (#4021) 
* Refactor and fix how stock consumption is displayed [SCI-6734]

* Refactor and fix display of stock warnings [SCI-6734]
 2022-04-14 14:27:31 +02:00
aignatov-bio 4a232ac391
Merge pull request #4020 from biosistemika/features/projects-experiments-pagination 
Features/projects experiments pagination
 2022-04-14 10:45:27 +02:00
ajugo 1338d4524f
Align items in assigned item section [SCI-6707] (#4007) 2022-04-13 10:12:01 +02:00
Anton d091c56e9f Add pagination for experiments [SCI-6656] 2022-04-12 15:16:02 +02:00
artoscinote 2d811cdc4c
Add snapshot error message below task status [SCI-6614] (#4009) 2022-04-12 13:28:26 +02:00
ajugo a9fc4c3c44
Adding/changing stock consumption [SCI-6708] (#4005) 
* Adding/changing stock consumption [SCI-6708]

* Fix hound [SCI-6708]
 2022-04-11 10:47:24 +02:00
ajugo 986e817fdc
Removed autofocus clear on open reminder flyout [SCI-6690] (#4003) 
* Removed clear autofocus on open reminder flyout [SCI-6690]

* Fix hound [SCI-6690]
 2022-04-08 18:08:55 +02:00
aignatov-bio 29cbf99498
Fix css for stotck modal [SCI-6698] (#3999) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-08 11:11:24 +02:00
aignatov-bio 3a4cab9d0a
Stock modal UX fixes [SCI-6714] (#3998) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-08 11:09:37 +02:00
ajugo 98144b225c
Fix color on consumption link [SCI-6686] (#3992) 2022-04-07 13:03:18 +02:00
Anton d96103d714 Add pagination to projects list [SCI-6655] 2022-04-07 12:22:52 +02:00
artoscinote 5d8ecb0c4a
Override error styling in stock column management [SCI-6674] (#3995) 2022-04-06 15:36:11 +02:00
artoscinote 73757c4820
Added styling for failed snapshots in sidebar [SCI-6636] (#3990) 
* Added styling for failed snapshots in sidebar [SCI-6636]

* Simplify markup for failed icon [SCI-6636]
 2022-04-05 15:45:49 +02:00
artoscinote 785ff4152e
Stock column management UX/UI fixes [SCI-6674] (#3979) 2022-04-05 10:30:06 +02:00
aignatov-bio 4df8faec7e
Fix css stock modal [SCI-6675] (#3989) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-05 10:25:47 +02:00
aignatov-bio 2a2a5b2725
Repository toolbar CSS fixes [SCI-6676] (#3984) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-04 12:02:59 +02:00
ajugo bb44152d54
Fix assigning and consuming items [SCI-6686] (#3985) 2022-04-04 11:07:46 +02:00
artoscinote 401a32edd9
Implement failed snapshot pop-up on task screen [SCI-6612] (#3950) 
* Implement failed snapshot pop-up on task screen [SCI-6612]

* Copy change [SCI-6612]

* Proper handling of snapshot transition error [SCI-6612]

* Move modal auto open logic to JS file [SCI-6612]

* Remove unnecessary .html_safe [SCI-6612]
 2022-04-04 11:04:03 +02:00
aignatov-bio ca53c3058a
Stock modal bugs [SCI-6667] (#3970) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-30 14:03:07 +02:00
Martin Artnik 45a325e824 Merge branch 'develop' into features/stock-management 2022-03-30 11:10:40 +02:00
ajugo f75265974e
Print protocol smart annotation and table improvements [SCI-6566] (#3925) 
* Improve table printing in the print menu [SCI-6566]

* Open smart annotation in new tab for print view [SCI-6566]

* Unify naming of same parameter [SCI-6566]

* Fix typo [SCI-6566]

* Fix hound errors [SCI-6566]
 2022-03-29 12:09:33 +02:00
aignatov-bio 103e20ee9a
Update front end validation for columns managment [SCI-6657] (#3962) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-28 21:31:49 +02:00
aignatov-bio 673f8c1a2a
Fix multiple stock bugs [SCI-6651] (#3959) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-28 12:43:09 +02:00
aignatov-bio 5e92429212
Add micro-interactions to reminders flyout [SCI-6627] (#3951) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-24 10:16:47 +01:00
aignatov-bio 004aeda601
Add stock filters [SCI-6547] (#3938) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-23 10:05:07 +01:00
aignatov-bio c6c073c750
Add micro interactions for stock modal [SCI-6625] (#3947) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-22 14:35:27 +01:00
ajugo 7cba738a9b
Date remidner flyout [SCI-6503] (#3937) 
* Implement date reminder flyout [SCI-6503]

* Show only days left for date reminder [SCI-6503]

* Pluralize day in reminders [SCI-6503]

* Create partials for different reminders [SCI-6503]

* Unify css for reminder [SCI-6503]
 2022-03-22 13:33:58 +01:00
artoscinote 297cd02da7
Handle locked stock consumption state [SCI-6608] (#3942) 2022-03-18 15:02:15 +01:00
aignatov-bio 0cfedb2155
Add datetime reminders to columns modal [SCI-6556] (#3934) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-18 14:40:09 +01:00
aignatov-bio fecaafecf9
Refactor repository toolbar [SCI-6545] (#3943) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-18 14:10:34 +01:00
ajugo be989245ed
Icon bell reminder for an assigned item on the task [SCI-6506] (#3929) 
* Add bell icon on assigned task [SCI-6506]

* Add flyout and improve quering [SCI-6506]
 2022-03-17 11:39:17 +01:00
ajugo a89244c537
Displaying low stock warning [SCI-6497] (#3912) 
* Low stock warning [SCI-6497

* Fix some bugs [SCI-6497]

* Fix to long line [SCI-6497]

* Clean not needed information in renderes [SCI-6497]
 2022-03-16 15:06:52 +01:00
ajugo d1610fba53
Low stock flyout reminders [SCI-6502] (#3932) 
* Display low stock flyout reminder [SCI-6502]

* Display low stock flyout reminder [SCI-6502]

* Adapt showing stock reminders for every bell icon click [SCI-6502]

* Correct hound error [SCI-6502]

* Fix event registration for fetching reminder data [SCI-6502]

* Fix event registration for fetching reminder data [SCI-6502]

* Fix hound [SCI-6502]

* Remove not needed line [SCI-6502]

* Add reminder template [SCI-6502]

* Add clearing messages [SCI-6502]
 2022-03-15 10:24:35 +01:00
Anton 8b8e2c6d92 Merge branch 'develop' into features/stock-management 2022-03-14 11:56:38 +01:00
ajugo 959b86b40c
Task inventory activity for assigned item consumption [SCI-6453] (#3830) 
* Add task inventory activity [SCI-6453]
 2022-03-09 18:43:38 +01:00
aignatov-bio bf058dea03
Add flyout for repository reminders [SCI-6501] (#3926) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-09 15:09:49 +01:00
aignatov-bio 10743921d4
Add reminders to stock modal [SCI-6557] (#3917) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-09 14:19:15 +01:00
aignatov-bio d89ea7d77f
Add red dot for date/datetime reminder [SCI-6499] (#3924) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-09 14:18:34 +01:00
artoscinote d577fcc824
Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911) 
* Implement basic logic for Date/DateTime/Stock reminders [SCI-6554]

* Implement bell icon [SCI-6500]

* Refactor reminder cells scope [SCI-6554]
 2022-03-09 14:13:48 +01:00
artoscinote e948fc20bc
Fix members dropdown CSS, order [SCI-6595] (#3919) 2022-03-07 17:11:35 +01:00
aignatov-bio d9dc27c2b8
Small UX fixes for filters [SCI-6569] (#3881) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-22 12:07:46 +01:00
aignatov-bio 6cee35dfa5
Small ux fixes [SCI-6539][SCI-6516] (#3864) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-16 12:56:54 +01:00
ajugo 9b6a70cdb0
Improve RTF responsiveness - move button to the right side [SCI-5795] (#3854) 2022-02-16 10:32:01 +01:00
aignatov-bio f2e4c579af
Multiple UX fixes for filters [SCI-6525] (#3858) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-15 15:03:25 +01:00
aignatov-bio afce0e34c4
Fix css for saved filters dropdown [SCI-6516] (#3843) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-11 12:44:22 +01:00
artoscinote bac8fbbe58
Disable filter save button on submit [SCI-6523] (#3833) 2022-02-11 10:14:19 +01:00
artoscinote 85ad4a692a
Fix assigned task filter issues [SCI-6492] (#3837) 2022-02-11 09:20:52 +01:00
Alex Kriuchykhin f66b89c7bb
Add permissions checking to assigned items view on tasks [SCI-6435] (#3801) 2022-02-04 14:24:15 +01:00
aignatov-bio 8c8c4344d6
Improve RTF responsiveness [SCI-5795] (#3813) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-01 14:38:09 +01:00
aignatov-bio 51b515fcee
Fix icons on tinyMCE [SCI-6477] (#3812) 
* Fix icons on tinyMCE [SCI-6477]

* mend

* mend

Co-authored-by: Anton <anton@scinote.net>
 2022-02-01 14:37:59 +01:00
artoscinote dd8b38604f
Filter loading/saving fixes [SCI-6475] (#3803) 
* Filter loading/saving fixes [SCI-6475]

* More bugfixes & code improvements [SCI-6475]

* Fix loading user filter [SCI-6475]
 2022-02-01 14:37:13 +01:00
aignatov-bio 2c88843924
Task stock consumption modal[SCI-6444][SCI-6445] (#3798) 
Add main logic for consumption on task [SCI-6444]

Co-authored-by: Anton <anton@scinote.net>
 2022-01-28 11:10:56 +01:00
Martin Artnik 5a1329f1df Fix loading of saved filters [SCI-6474] 2022-01-27 13:33:43 +01:00
artoscinote d779f352a7
Merge pull request #3796 from biosistemika/features/repository-filters 
Features/repository filters
 2022-01-26 10:36:30 +01:00
aignatov-bio 371d5f0636
Add current/new amount section to stock [SCI-6416] (#3791) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-26 10:28:43 +01:00
aignatov-bio 86b26cfade
CSS fixes for bmt filters [SCI-6084] (#3764) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-25 10:22:11 +01:00
artoscinote 354bf4b808
Fix for Safari artefacts in TinyMCE [SCI-6154] (#3794) 2022-01-25 10:10:47 +01:00
Martin Artnik 711005425f Merge branch 'features/bmt-search' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:30:33 +01:00
Martin Artnik abac837cd4 Merge branch 'develop' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:26:08 +01:00
artoscinote 95a36b6870
Implemented stock management modal [SCI-6417] (#3788) 
* Implement inventory stock management modal [SCI-6417]

* Add generalized validation mechanic, some bugfixes [SCI-6417]

* Fix permission check and method name in RepositoryStockValue [SCI-6417]
 2022-01-20 12:44:57 +01:00
aignatov-bio 05547da457
Add stock table renders [SCI-6412] (#3787) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-19 13:19:56 +01:00
aignatov-bio 01f1b5bd10
Add stock column type (#3786) 
* Add stock column type

* Create new stock column [SCI-6410]

* Small fixed for stock column [SCI-6410]

* Add stock column validations [SCI-6410]

Co-authored-by: Anton <anton@scinote.net>
 2022-01-18 13:17:05 +01:00
aignatov-bio 8fcf4e9aa2
Add styling for repository filters [SCI-6232] (#3779) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-17 10:24:57 +01:00
ajugo c570cef06c
Style corrections for printed protocol [SCI-6326] (#3782) 
* Printed protocol display improvements [SCI-6326]

* Fix new line

* Fix hound [SCI-6326]

* Using image_tag helper [SCI-6326]

* Move pictures to asset folder [SCI-6326]
 2022-01-14 15:02:04 +01:00
Anton 304727257e Fix status column emojis [SCI-6407] 2022-01-11 11:27:00 +01:00
artoscinote 3f87d250ce
Implement saving repository filters [SCI-6230] (#3748) 
* Implement saving repository filters [SCI-6230]

* Remove unnecessary logging [SCI-6230]

* Refactor filter saving [SCI-6230]

* Remove unnecessary files, linter fixes [SCI_6230]
 2022-01-05 15:02:09 +01:00
Martin Artnik c9e4a9bab7 Merge branch 'master' into features/bmt-search 2021-12-20 13:08:20 +01:00
artoscinote 49ec3edb49
Add apply filters functionality to FE [SCI-6229] (#3742) 2021-12-15 12:48:28 +01:00
aignatov-bio 8ce321456e
Add time filter [SCI-6217] (#3738) 
* Add time filter [SCI-6217]

* Add datetime filter for inventory [SCI-6220]

* Refactor components structure

Co-authored-by: Anton <anton@scinote.net>
 2021-12-15 12:22:24 +01:00
aignatov-bio 00f30b8d6c
Add assigned tasks filters [SCI-6221] (#3726) 
* Add endpoint for repository tasks [SCI-6221]

* Add assigned tasks filter [SCI-6221]

Co-authored-by: Anton <anton@scinote.net>
 2021-12-07 15:28:20 +01:00
artoscinote 1c0a83a76e
Fix propagation and display of role on experiment role reset [SCI-6337] (#3725) 2021-12-07 11:42:14 +01:00
artoscinote 561746158e
Further fix scoping of table styles [SCI-6315] (#3720) 2021-12-06 10:40:08 +01:00
artoscinote 272752ae4f
Fix scoping of table styles [SCI-6315] (#3719) 2021-12-03 16:21:18 +01:00
artoscinote 3f7f576b29
Print protocol fixes [SCI-6318] (#3717) 
* Fix smart annotations [SCI-6318]

* Fix asset rendering [SCI-6316, SCI-6417]

* Copy fix [SCI-6315]

* Fix print protocol name handling [SCI-6318]

* CSS linter fixes

* Add support for handson tables [SCI-6318]

* Use partial for handsontable formulas [SCI-6318]
 2021-12-03 13:44:18 +01:00
artoscinote 78ab094bf2
Implement public user grouping, deletion and updates to manually assigned [SCI-6228] (#3701) 
* Implement public user grouping, deletion and updates to manually assigned [SCI-6228]

* PR fixes [SCI-6228]

* Permission check improvement [SCI-6228]
 2021-12-01 16:23:24 +01:00
artoscinote 9937d1d913
Add print feature to protocols [SCI-6028] (#3700) 
* Add print feature to protocols [SCI-6028]

* Close tab after closing print dialog [SCI-6028]

* CSS linter fixes [SCI-6028]
 2021-12-01 11:16:45 +01:00
aignatov-bio 12fadb9c25
Add basic structure for repository filters [SCI-6211] (#3698) 
* Add container for inventory filters [SCI-6211]

* Add basic structure for filters [SCI-6211]

* Add i18n and css for filters dropdown [SCI-6211]

* Fix markup

Co-authored-by: Anton <anton@scinote.net>
 2021-11-25 20:34:22 +01:00
Anton a44dd8c915 Merge branch 'features/bmt-search' into features/repository-filters 2021-11-22 14:24:28 +01:00
aignatov-bio 2a135ac120
Fix repository archive title [SCI-6267] (#3671) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-17 14:53:04 +01:00
Anton c00a7b7b8f Update bmt filters default state [SCI-6090] 2021-11-16 15:14:00 +01:00
aignatov-bio 06788bfeb6
Update CSS for BMT filters [SCI-6084] (#3652) 
* Update css for bmt filters [SCI-6084]

* Create shared component for dropdown [SCI-6084]

Co-authored-by: Anton <anton@scinote.net>
 2021-11-16 14:46:08 +01:00
artoscinote d08882e7f2
Style and copy fix [SCI-6272] (#3670) 2021-11-16 11:25:47 +01:00
aignatov-bio 8f9ab4f6c3
Refactor permissions breadcrumbs for users [SCI-6260] (#3665) 
* Refactor permissions breadcrumbs for users [SCI-6260]

* Change creator assignments to automatically [SCI-6260]

Co-authored-by: Anton <anton@scinote.net>
 2021-11-15 15:02:22 +01:00
artoscinote 4ce0c53d36
Implemented reset role functionality [SCI-6261] (#3662) 
* Implemented reset role functionality [SCI-6261]

* Linter fixes [SCI-6261]
 2021-11-15 11:12:31 +01:00
artoscinote 9f92cfab1a
Fixed access modal styling issues [SCI-6241] (#3646) 
* Fixed access modal styling issues [SCI-6241]

* Refactor user access list to use flex [SCI-6241]

* Linter fixes [SCI-6241]
 2021-11-10 11:40:41 +01:00
aignatov-bio d3e178e5a2
Small CSS fixes for permissions [SCI-6207] (#3638) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-09 09:26:22 +01:00
Alex Kriuchykhin f11a4701d0
Merge pull request #3629 from artoscinote/ma_SCI_6193 
Added optional webhook secret key [SCI-6193]
 2021-11-08 21:00:40 +01:00
Martin Artnik 3406cd9235 Added optional webhook secret key [SCI-6193] 2021-11-03 15:04:13 +01:00
Oleksii Kriuchykhin 47b8347ce6 Add support of Okta SSO provider [SCI-6184] 2021-11-02 16:19:56 +01:00
Anton f7d1541e01 Add scrollbars to filters dropdown [SCI-6085] 2021-11-02 12:18:00 +01:00
Oleksii Kriuchykhin a99599efea Merge branch 'features/new_permissions' into develop 2021-10-29 15:16:30 +02:00
aignatov-bio 22034089a6
Update experiment move service [SCI-6149] (#3599) 
* Update experiment move service [SCI-6149]

* Move permission check to helper [SCI-6149]

Co-authored-by: Anton <anton@scinote.net>
 2021-10-27 13:48:52 +02:00
aignatov-bio 1a05c3a40c
Update canvas task cards [SCI-5021] (#3608) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-26 12:06:26 +02:00
aignatov-bio aa4b765407
Update assign/unassign rows to task [SCI-6150] (#3604) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-26 11:41:08 +02:00
Zmago Devetak 4a4c344a3a
Task UX: Update assigning a Task to user(s) (#3429) 
* add dynmic select for user assignment on task

* update the user assignment so it looks like tags picker

* fix code style

* Code style fixes [SCI-5871]

* Code style fixes [SCI-5871]

* Destroy and search action fixes [SCI-5871]

Co-authored-by: Martin Artnik <martin@scinote.net>
 2021-10-14 11:49:27 +02:00
aignatov-bio 328f1cfe4d
Add blank tasks to canvas [SCI-6133] (#3588) 2021-10-13 10:08:39 +02:00
Martin Artnik 49b9ee37cc Merge branch 'develop' into features/bmt-search 2021-09-24 11:01:27 +02:00
aignatov-bio a99f9db520
Small CSS fixes [SCI-6017][SCI-6019] (#3548) 2021-09-17 14:15:01 +02:00
aignatov-bio 857ce2d90f
Fix title for archived folders [SCI-6049] (#3541) 2021-09-17 14:12:53 +02:00
Martin Artnik ade1385392 Merge branch 'develop' into features/bmt-search 2021-09-06 10:51:04 +02:00
Martin Artnik 7e6ca3be8a Merge branch 'develop' into features/new_permissions 2021-09-06 10:33:32 +02:00
Martin Artnik 206ba3d79c Reworked how search error works with repository table [SCI-5961] 2021-09-06 10:12:10 +02:00
Martin Artnik ca6dfa2541 Display dropdown item info border using CSS [SCI-6013] 2021-09-02 12:58:25 +02:00
Martin Artnik 35e815449d Experiment dropdown layout fixes [SCI-6013] 2021-09-02 12:42:06 +02:00
Martin Artnik 6d92af4b2f Made barcode search globally available [SCI-6022] 2021-08-30 14:41:31 +02:00
Martin Artnik 896f0ce1e3 Implemented applying BMT filters [SCI-5980] 2021-08-30 10:49:15 +02:00
artoscinote ef0e45be04 Implemented frontend for BMT-type repository [SCI-5991] (#3503) 
* Implemented frontend for BMT-type repository [SCI-5991]

* Refactor repository view, fix column reordering [SCI-5991]

* Remove type mapping for default columns in column management [SCI-5991]

* Repository table partial fix, remove non-relevant migration [SCI-5991]
 2021-08-30 10:49:15 +02:00
aignatov-bio 90d4a5f7d1 Add save bmt filters front end [SCI-5962] (#3505) 2021-08-30 10:49:15 +02:00
Martin Artnik a872ea8a47 CSS fixes [SCI-5956] 2021-08-30 10:49:15 +02:00
Martin Artnik 9a87bad740 Implement filters and JSON building [SCI-5956] 2021-08-30 10:49:15 +02:00
aignatov-bio 958ee92db7 Add BMT filters interactions [SCI-5955] (#3478) 
* Add BMT filters interactions [SCI-5955]

* Small fixes [SCI-5955]
 2021-08-30 10:49:14 +02:00
aignatov-bio a61446acf5
Add close button to label printer modal [SCI-6000] (#3492) 2021-08-19 12:04:41 +02:00
aignatov-bio 852d2cc03c
CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970] (#3486) 
* CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970]

* Small fixes [SCI-5972]
 2021-08-16 10:51:46 +02:00
Martin Artnik 861be4bb35 Fix issues with BioEddie integration [SCI-5982] 2021-08-11 09:50:00 +02:00
Martin Artnik 57d5e6c2a7 Merge branch 'develop' into features/barcodes 2021-08-03 13:36:36 +02:00
artoscinote f839cb5256
Merge pull request #3464 from biosistemika/features/bioeddie-integration 
Features/bioeddie integration
 2021-08-03 13:32:53 +02:00
artoscinote f24207588c
Merge pull request #3463 from biosistemika/features/webhooks 
Features/webhooks
 2021-08-03 13:32:12 +02:00
Martin Artnik a82af505eb Merge branch 'develop' into features/webhooks 2021-08-02 16:22:52 +02:00
Martin Artnik ae174b276a Code review fixes and error handling improvements [SCI-5942] 2021-08-02 15:42:53 +02:00
aignatov-bio 43571b5692
Print labels changes [SCI-5943] (#3461) 2021-08-02 15:38:37 +02:00
aignatov-bio 02408ae885
Add printing status modal [SCI-5910] (#3454) 2021-07-29 12:24:46 +02:00
Martin Artnik 67f4e81a3a Merge branch 'develop' into features/new_permissions 2021-07-28 15:16:47 +02:00
aignatov-bio a54f36a486
Add empty state for barcode printers [SCI-5935] (#3455) 2021-07-28 11:12:46 +02:00
aignatov-bio 8d033274e4
Add barcode scanners support [SCI-5929] (#3456) 2021-07-27 22:01:08 +02:00
Martin Artnik d54a743e64 Fixed handling of dropdown-selector max height [SCI-5898] 2021-07-22 09:37:25 +02:00
aignatov-bio be777a8919
Add barcodes to repository item card [SCI-5883][SCI-5884] (#3447) 
* Add barcodes to repository item card [SCI-5883][SCI-5884]

* Fix markup [SCI-5883]
 2021-07-21 21:32:42 +02:00
aignatov-bio f2e5dc8b2f
Add printers to addon page [SCI-5904][SCI-5931] (#3450) 
* Add printers to addon page [SCI-5904]

* Fix markup
 2021-07-21 13:48:38 +02:00
Martin Artnik f55761a491 Invite member search design fixes [SCI-5892] 2021-07-19 15:42:26 +02:00
Martin Artnik 71aa418dc6 Fixed UX issues in user invites modal [SCI-5898] 2021-07-19 12:39:18 +02:00
Martin Artnik 96a5b97bdb Implement Save & Register molecule [SCI-5879] 2021-07-15 12:37:04 +02:00
Martin Artnik 40a8f3a434 Switch to using dropdownSelector for emails input [SCI-5099] 2021-07-09 11:20:48 +02:00
Martin Artnik fe06effbd7 Fix linter errors [SCI-5099] 2021-07-09 09:40:06 +02:00
Martin Artnik fb040bee07 Fix styling, functionality issues with invite users modal [SCI-5099] 2021-07-08 16:10:20 +02:00
Oleksii Kriuchykhin d1208bad0b Merge branch 'develop' into features/new_permissions 2021-07-07 13:44:36 +02:00