Commit graph

8567 commits

Author SHA1 Message Date
ajugo 90db2bace9
API endpoint to generate with ELN data for Validaide [SCI-6663][SCI-6798] (#4012)
* Manuscript JSON data SCI-6663

* Clean code for generate manuscript data [SCI-6663]

* Include project data into json [SCI-6663]

* Fix hound [SCI-6663]

* Fix hound [SCI-6663]

* Remove manuscript naming [SCI-6663]

* Add local storage assets capabilites [SCI-6663]

* Rename project [SCI-6663]

* Enable multple projects and clean input [SCI-6798]

* Fix hound [SCI-6798]
2022-05-19 09:08:05 +02:00
Anton 9cd0e010a6 Add file upload logic [SCI-6829] 2022-05-19 08:54:22 +02:00
Oleksii Kriuchykhin 1b63da13b4 Improve stock consumption recording [SCI-6805] 2022-05-18 17:02:12 +02:00
Anton 134558355d Add file modal [SCI-6828] 2022-05-18 11:12:53 +02:00
ajugo e8d7fa50b8
Enable smart annotation notifcation at consumption and some rewording [SCI-6802] (#4094) 2022-05-17 11:41:53 +02:00
Anton 9aaf4a136e Add menu to attachment cards [SCI-6816] 2022-05-17 10:41:34 +02:00
ajugo ee448a9997
Micro-interactions for reminder flyout correction [SCI-6804] (#4096) 2022-05-16 11:16:07 +02:00
Anton 711bd77222 Add manage dropdown to attachments section [SCI-6815] 2022-05-16 11:05:18 +02:00
Anton 8f0789ec72 Add inline asset card [SCI-6811] 2022-05-13 13:09:01 +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 940b0ea744 Add general layout for step attachments [SCI-6811] 2022-05-12 12:26:50 +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 24d68da455 Fix tinymce assets for steps [SCI-6809] 2022-05-11 13:01:23 +02:00
Anton c0660d0243 Small fixes [SCI-6808] 2022-05-11 11:32:27 +02:00
Anton 04e16cf6b5 Add text component [SCI-6808] 2022-05-11 09:51:47 +02:00
Alex Kriuchykhin ab665e5f43
Merge pull request #4086 from okriuchykhin/ok_SCI_6824
Fix display of repository snapshot with stock consumption [SCI-6824]
2022-05-10 22:26:24 +02:00
Oleksii Kriuchykhin 1e9dd95716 Fix duplicated counters on task card [SCI-6825] 2022-05-10 22:23:42 +02:00
Oleksii Kriuchykhin dfc68b997c Fix display of repository snapshot with stock consumption [SCI-6824] 2022-05-10 22:21:48 +02:00
Alex Kriuchykhin b48d0710a4
Merge pull request #4084 from okriuchykhin/ok_SCI_6822
Fix archived tasks view [SCI-6822]
2022-05-10 15:42:03 +02:00
Oleksii Kriuchykhin 6fb44eb78e Fix archived tasks view [SCI-6822] 2022-05-10 15:39:59 +02:00
aignatov-bio d07daa73cb
Merge pull request #4072 from aignatov-bio/ai-sci-6781-add-confirmation-modal-for-step-deletion
Add delete step modal [SCI-6781]
2022-05-10 13:28:47 +02:00
Alex Kriuchykhin b04c8ab29c
Merge pull request #4082 from okriuchykhin/ok_SCI_6817
Fix task dropdown actions [SCI-6817]
2022-05-10 13:17:47 +02:00
Oleksii Kriuchykhin a8c56891d4 Fix task dropdown actions [SCI-6817] 2022-05-10 11:27:46 +02:00
Oleksii Kriuchykhin 823e552ef6 Fix displaying of stock consumption units [SCI-6795] 2022-05-10 10:19:37 +02:00
aignatov-bio 6cbcac3a22
Merge pull request #4080 from aignatov-bio/ai-sci-6807-fix-stock-consumption-rounding
Fix stock consumption rounding [SCI-6807]
2022-05-09 11:55:17 +02:00
Anton 2f20109b0d Fix stock consumption rounding [SCI-6807] 2022-05-09 11:51:39 +02:00
Alex Kriuchykhin c4b524af4b
Merge pull request #4079 from okriuchykhin/ok_SCI_6797
Improve loading time of canvas view/edit [SCI-6797]
2022-05-09 11:46:04 +02:00
Oleksii Kriuchykhin e957d7d35e Improve loading time of canvas view/edit [SCI-6797] 2022-05-09 11:40:31 +02:00
artoscinote 98ac1c126f
Stock editing and reminder fixes [SCI-6803] (#4078)
* Fix stock editing after adding new value [SCI-6803]

* Don't load reminders for snapshots [SCI-6803]
2022-05-09 11:20:38 +02:00
Alex Kriuchykhin 297c58c0cd
Merge pull request #4075 from okriuchykhin/ok_SCI_6800
Allow deletion of stock columns when stock management is disabled [SCI-6800]
2022-05-09 10:26:44 +02:00
Alex Kriuchykhin 87e3a71709
Merge pull request #4071 from okriuchykhin/ok_SCI_6155
Improve input field for adding new team [SCI-6155]
2022-05-09 10:26:15 +02:00
Anton 3856fd9cf1 Add show icon for password [SCI-6791] 2022-05-06 16:14:21 +02:00
Anton 252680f0a1 Add table component [SCI-6777] 2022-05-06 12:09:54 +02:00
Oleksii Kriuchykhin 2ffb4acb2f Allow deleteion of stock columns when stock management is disabled [SCI-6800] 2022-05-05 15:44:21 +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
Anton 277e202c90 Add delete step modal [SCI-6781] 2022-05-04 15:57:13 +02:00
Oleksii Kriuchykhin 3d26da9e5e Improve input field for adding new team [SCI-6155] 2022-05-04 14:30:26 +02:00
Alex Kriuchykhin 685032cafb
Fix saving of new date time columns with reminders [SCI-6774] (#4068) 2022-05-04 11:50:57 +02:00
artoscinote 5454aa26bc
Implement protocol status bar functionality [SCI-6760] (#4070) 2022-05-04 11:49:57 +02:00
Anton 3b60c62c79 Refactor modal loading [SCI-6780] 2022-05-04 10:36:13 +02:00
Anton e06b398bb4 Add delete action for step components [SCI-6780] 2022-05-03 15:21:47 +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 d71ba2f7a1 Fix serailizer [SCI-6758] 2022-05-03 13:55:08 +02:00
Anton 6a827022f6 Add insert step element dropdown [SCI-6758] 2022-05-03 13:22:26 +02:00
ajugo 2bda271615
Open repository on print view [SCI-6566] (#4055) 2022-05-03 09:30:33 +02:00
artoscinote ac45edb14c
Added validations for date(time) column reminder [SCI-6775] (#4063) 2022-04-28 15:30:20 +02:00
aignatov-bio 0ae5006a10
Merge pull request #4062 from aignatov-bio/ai-sci-6767-repository-css-fixes
Small CSS fixes for repository [SCI-6767]
2022-04-28 14:36:46 +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 36ae58872f Show last page message only after second page [SCI-6761] 2022-04-28 14:11:11 +02:00
Anton 189f4335ea Add main layout for step [SCI-6755] 2022-04-28 11:38:33 +02:00
Alex Kriuchykhin 892b5e2348
Merge pull request #4056 from okriuchykhin/ok_SCI_6769
Fix blank stock consumption representation in reports [SCI-6769]
2022-04-28 11:18:12 +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 b6501fcf36 Fix blank stock consumption representation in reports [SCI-6769] 2022-04-25 17:10:44 +02:00
Alex Kriuchykhin 29bf85de44
Merge pull request #4053 from okriuchykhin/ok_SCI_6776
Fix duplicated inventories on tasks for export all [SCI-6776]
2022-04-25 15:56:01 +02:00
artoscinote da8250dba8
Stock / stock consumption display fixes [SCI-6771] (#4054) 2022-04-25 15:23:12 +02:00
Oleksii Kriuchykhin 9f5ebee4e2 Fix duplicated inventories on tasks for export all [SCI-6776] 2022-04-25 13:45:58 +02:00
Alex Kriuchykhin 5d0fb932e7
Merge pull request #4046 from okriuchykhin/ok_SCI_6722
Add results counter to second navigation [SCI-6722]
2022-04-25 13:16:18 +02:00
Alex Kriuchykhin 49bc361dee
Fix formatting of stock consumption on tasks [SCI-6737] (#4050) 2022-04-25 13:08:33 +02:00
aignatov-bio 3d78559559
Merge pull request #4047 from aignatov-bio/ai-sci-6754-add-creation-step-functionality
Add step creation/deletion functionality [SCI-6754]
2022-04-25 12:46:33 +02:00
aignatov-bio 957e79f46a
Merge pull request #4051 from aignatov-bio/ai-sci-6743-add-newgative-validation-for-treshold
Add negative validation for threshold [SCI-6743]
2022-04-25 12:46:20 +02:00
Anton ba3c73439a Add step creation/deletion functionality [SCI-6754] 2022-04-25 12:40:14 +02:00
aignatov-bio 95060cecf9
Merge pull request #4052 from aignatov-bio/ai-sci-6770-add-bell-icon-for-negative-stock
Add bell icon for negative stock [SCI-6770]
2022-04-25 12:31:40 +02:00
Anton c9d114e71e Add bell icon for negative stock [SCI-6770] 2022-04-25 12:29:10 +02:00
Anton b56f11fc18 Add negative validation for treshold [SCI-6743] 2022-04-25 12:18:22 +02:00
artoscinote d863618846
Enable team normal user to edit repository files [SCI-6765] (#4049) 2022-04-25 12:18:01 +02:00
Oleksii Kriuchykhin b148bd2057 Add results counter to secnd navigation [SCI-6722] 2022-04-22 12:24:14 +02:00
ajugo 2b2888e6f7
Allow tag creation on task level if you have permission [SCI-6573] (#4031) 2022-04-22 11:50:32 +02:00
aignatov-bio 4d429b28a8
Merge branch 'develop' into ai-sci-6743-add-negative-validation-for-stock-modal-and-consumption-modal 2022-04-22 11:15:04 +02:00
aignatov-bio bc80122df0
Merge pull request #4042 from aignatov-bio/ai-sci-6741-stock-consumption-modal-highlight-negative-with-red
Highlight negative value in consumption modal [SCI-6741]
2022-04-22 11:13:34 +02:00
artoscinote f9357611a0
Update stock value without reloading the table [SCI-6745] (#4041) 2022-04-22 11:13:00 +02:00
Martin Artnik 4bd5df4e0e Fix snapshot creation with stock consumption [SCI-6762] 2022-04-22 10:49:42 +02:00
Alex Kriuchykhin e15a382e37
Merge pull request #4032 from okriuchykhin/ok_SCI_6712
Add models for step orderable elements, migrate step descriptions [SCI-6712]
2022-04-22 09:33:41 +02:00
artoscinote 6ef190f353
Basic Vue setup for protocols [SCI-6749] (#4044) 2022-04-21 15:12:34 +02:00
Anton df2ff32f2e Update general layout for task [SCI-6713] 2022-04-21 14:43:10 +02:00
Anton fc3d47d220 Highlight negative value in consumption modal [SCI-6741] 2022-04-21 12:11:38 +02:00
Anton f8f5791c62 Add negative validation for stock [SCI-6743] 2022-04-20 15:11:05 +02:00
Anton e28095f781 Fix default stock column default units selection [SCI-6744] 2022-04-20 14:52:34 +02:00
Anton fd736f99c1 Add comment to repository stock activities [SCI-6746] 2022-04-20 11:29:16 +02:00
aignatov-bio 918a11a0b0
Fix decimal render function [SCI-6742] (#4037)
Co-authored-by: Anton <anton@scinote.net>
2022-04-20 11:07:37 +02:00
artoscinote 4daf01feee
Fix snapshot consumption display [SCI-6734] (#4035) 2022-04-20 11:07:26 +02:00
artoscinote e3cbf5903a
Move list-type column includes to param, unify naming [SCI-6738] (#4036)
* Add default includes for inventory columns with lists [SCI-6738]

* Move list-type column includes to param, unify naming [SCI-6738]
2022-04-20 11:07:15 +02:00
ajugo 54474b2bba
API GET repository stock column output fix [SCI-6550] (#4030)
* Add include stock unit items to Stock column get [SCI-6550]

* Fix stock column test [SCI-6550]

* Fix hound [SCI-6550]
2022-04-19 16:05:17 +02:00
aignatov-bio 1a2a58ff5f
Merge pull request #4033 from aignatov-bio/ai-sci-6740-fix-stock-modal-add-remove-value
Fix stock modal add/remove value preset value [SCI-6740]
2022-04-19 13:46:24 +02:00
Anton 1be5ba9dd0 Fix stock modal add/remove value preset value [SCI-6740] 2022-04-19 13:44:53 +02:00
Alex Kriuchykhin 42ae32f81a
Merge pull request #4025 from okriuchykhin/ok_SCI_6419
Improve stock ledger records creation [SCI-6419]
2022-04-19 13:32:58 +02:00
Oleksii Kriuchykhin 5a17ad6be9 Add models for step orderable elements, migrate step descriptions [SCI-6712] 2022-04-19 13:26:13 +02:00
Oleksii Kriuchykhin e50d52e8ef Improve stock ledger records creation [SCI-6419] 2022-04-18 16:24:27 +02:00
artoscinote 42605e1a8a
Fix inviting users to team [SCI-6725] (#4026) 2022-04-15 15:31:08 +02:00
aignatov-bio 31f4b35186
Merge branch 'develop' into ai-sci-6731-fix-edit-title-for-stock-consumption-modal 2022-04-15 14:43:51 +02:00
aignatov-bio 85a54cbcdf
Merge pull request #4029 from aignatov-bio/ai-sci-6729-highlight-negative-stock-in-modal-with-red
Highlight negative stock in modal with red [SCI-6729]
2022-04-15 14:43:07 +02:00
Anton ed49e93a6a Highlight negative stock in modal with red [SCI-6729] 2022-04-15 12:08:29 +02:00
Anton 2481ba566a Add edit title for stock consumption modal [SCI-6731] 2022-04-15 11:47:49 +02:00
Anton 441f6b977d Fix decimals in stock consumption modal [SCI-6732] 2022-04-15 11:40:47 +02:00
artoscinote 6b309871a3
Hide reminders settings and red dots if stock is disabled [SCI-6673] (#4024) 2022-04-15 10:55:14 +02:00
ajugo 02677aaaba
Focus authenticator code field [SCI-6716] (#4022) 2022-04-14 15:17:56 +02:00
aignatov-bio 4f2fd79f67
Merge pull request #4023 from aignatov-bio/ai-sci-6735-fix-stock-consumption-in-reports
Fix stock consumption in reports [SCI-6735]
2022-04-14 14:51:38 +02:00
Anton c73dc5ea2f Fix markup 2022-04-14 14:47:51 +02:00
Anton 84f91634d3 Fix stock consumption in reports [SCI-6735] 2022-04-14 14:46:09 +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
artoscinote f3ce338600
Fix error modal opening on successful snapshot [SCI-6726] (#4019) 2022-04-13 14:22:34 +02:00
artoscinote dd0661a462
Change the way setting stock works [SCI-6730] (#4018) 2022-04-13 14:22:22 +02:00
aignatov-bio ab40275243
Fix red dot for date reminders [SCI-6696] (#4016)
Co-authored-by: Anton <anton@scinote.net>
2022-04-13 14:20:33 +02:00
aignatov-bio 5ac9f51220
Add aibility to delete stock column [SCI-6723] (#4017)
Co-authored-by: Anton <anton@scinote.net>
2022-04-13 14:20:23 +02:00
aignatov-bio 36639727a1
Stock small ux fixes [SCI-6714] (#4015)
Co-authored-by: Anton <anton@scinote.net>
2022-04-13 12:15:30 +02:00
artoscinote 04ab92b8e2
Fix removing stock reminder threshold [SCI-6724] (#4010) 2022-04-13 11:35:45 +02:00
artoscinote ee26204af2
Move cursor to end of value when focusing consumption amount [SCI-6727] (#4013) 2022-04-13 11:35:22 +02:00
Alex Kriuchykhin 94083cf270
Revert "tmp (#3935)" (#4014)
This reverts commit 043086d55f.
2022-04-13 11:11:07 +02:00
Alex Kriuchykhin 043086d55f
tmp (#3935) 2022-04-13 11:09:48 +02:00
Alex Kriuchykhin f7f03b19c0
Add locking and unique index to repository row assigning [SCI-6591] (#3921) 2022-04-13 10:54:23 +02:00
ajugo 1338d4524f
Align items in assigned item section [SCI-6707] (#4007) 2022-04-13 10:12:01 +02:00
Alex Kriuchykhin 1385c6964c
Fix sorting by time and time range columns [SCI-6683] (#4011) 2022-04-12 15:56:20 +02:00
Anton d091c56e9f Add pagination for experiments [SCI-6656] 2022-04-12 15:16:02 +02:00
artoscinote 83ac50c57d
Add repository snapshot error modal [SCI-6613] (#3993) 2022-04-12 13:29:11 +02:00
artoscinote 2d811cdc4c
Add snapshot error message below task status [SCI-6614] (#4009) 2022-04-12 13:28:26 +02:00
aignatov-bio 433d69c10a
Remove date red dots for snapshots [SCI-6715] (#4004)
Co-authored-by: Anton <anton@scinote.net>
2022-04-12 13:14:11 +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
ajugo 0a5e93a018
API: add endpoint for creating stock column [SCI-6550] (#3956)
* Add test for repositoty stock column api [SCI-6550]

* Create and update stock column [SCI-6550]

* Change stock unit [SCI-6550]

* Fix hound [SCI-6550]

* Fix on delete [SCI-6550]

* Fix houd [SCI-6550]
2022-04-08 14:09:00 +02:00
artoscinote d696239649
Fix collapsing of assigned items tables [SCI-6705] (#4000) 2022-04-08 13:55:53 +02:00
ajugo 0ca9ae2ab9
API: add endpoint for updating of stock [SCI-6549] (#3955)
* Add test for Stock repository cell [SCI-6549]

* Create and update stock inventory cell [SCI-6549]

* Fix hound errors [SCI-6549]

* Fix ledger recording [SCI-6549]

* Fix api endpoint [SCI-6549]

* Fix hound [SCI-6549]
2022-04-08 11:30:44 +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
Alex Kriuchykhin f8a598b408
Improve loading of the dashboard [SCI-6618] (#4001) 2022-04-08 11:09:13 +02:00
Alex Kriuchykhin 09d0bb4a32
Fix sorting by date time columns in inventories [SCI-6683] (#4002) 2022-04-08 11:08:51 +02:00
ajugo 98144b225c
Fix color on consumption link [SCI-6686] (#3992) 2022-04-07 13:03:18 +02:00
artoscinote 5effe34221
Add reminder preset to date(time) reminders [SCI-6693] (#3996) 2022-04-07 12:27:21 +02:00
Anton d96103d714 Add pagination to projects list [SCI-6655] 2022-04-07 12:22:52 +02:00
artoscinote 352ec031ce
Fix repository full view tables without stock management [SCI-6703] (#3994) 2022-04-06 15:36:26 +02:00
artoscinote 5d8ecb0c4a
Override error styling in stock column management [SCI-6674] (#3995) 2022-04-06 15:36:11 +02:00
artoscinote 1cb7704c86
Turn off autocomplete for stock amount/reminder [SCI-6694] (#3988) 2022-04-05 15:46:04 +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
aignatov-bio a85b78291d
Fix red dot for dates in repository [SCI-6696] (#3991)
Co-authored-by: Anton <anton@scinote.net>
2022-04-05 14:40:09 +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
Alex Kriuchykhin 77daa16b78
Fix inventory sorting with date time reminders [SCI-6683] (#3980) 2022-04-04 12:10:40 +02:00
aignatov-bio be9a576842
Fix reminder dropdown on task screen [SCI-6678] (#3987)
Co-authored-by: Anton <anton@scinote.net>
2022-04-04 12:10:14 +02:00
artoscinote 8d25f456d1
Add basic validation to reminder value to prevent integer overflow errors [SCI-6693] (#3986) 2022-04-04 12:09:41 +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
artoscinote a629e1ae71
Disable stock managememnt for all tables in my module context [SCI-6692] (#3983) 2022-04-04 10:13:49 +02:00
aignatov-bio b6e34266f9
Update repository card view for stock [SCI-6685] (#3982)
Co-authored-by: Anton <anton@scinote.net>
2022-04-01 13:59:44 +02:00
artoscinote da6188df94
Don't load reminders if the stock feature is disabled [SCI-6673] (#3981)
* Don't load reminders if the stock feature is disabled [SCI-6673]

* Don't load reminders if the stock feature is disabled [SCI-6673]

* Unify stock management enabled check [6673]
2022-04-01 13:54:08 +02:00
Alex Kriuchykhin 9e07766314
Fix saving of inventory date time reminders saving [SCI-6672] (#3976) 2022-03-31 14:59:29 +02:00
aignatov-bio c480f28a09
Fix red dot for datetime columns [SCI-6684] (#3977)
Co-authored-by: Anton <anton@scinote.net>
2022-03-31 14:57:58 +02:00
artoscinote b516cf66ef
Hide reminders and disable stock consumption for archived items [SCI-6689] (#3978) 2022-03-31 14:56:23 +02:00
aignatov-bio ede5e958db
Fix filters loading for stock filter [SCI-6687] (#3975)
Co-authored-by: Anton <anton@scinote.net>
2022-03-31 14:40:17 +02:00
artoscinote addd4a9522
Make stock column work properly with different orders [SCI-6677] (#3974) 2022-03-31 14:06:37 +02:00
aignatov-bio a32dd54a6e
Toolbar fixes [SCI-6670] (#3973)
Co-authored-by: Anton <anton@scinote.net>
2022-03-31 14:04:00 +02:00
artoscinote 229a27750f
Implement stock consumption via the API [SCI-6642] (#3964)
* Implement stock consumption via the API [SCI-6642]

* Remove unnecessary attribute from InventoryItemSerializer [SCI-6642]

* Amend permission check, add nested transaction support to consume_stock method [SCI-6642]
2022-03-30 14:33:26 +02:00
Alex Kriuchykhin ac7a6edab5
Always use Tika text extractor in server mode [SCI-6658] (#3957) 2022-03-30 14:08:36 +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
artoscinote 36fbfcab2f
Implement hide all repository reminders button [SCI-6505] (#3940) 2022-03-30 10:54:55 +02:00
Alex Kriuchykhin ae97bd64f7
Fix assigned items fullview modal [SCI-6664] (#3968) 2022-03-30 10:14:04 +02:00
Alex Kriuchykhin fad04fa520
Show archive icon only on archived projects in the header [SCI-6617] (#3965) 2022-03-30 10:13:43 +02:00
Alex Kriuchykhin 4a4b8ff6b0
Fix caching of an experiment card dropdown [SCI-6606] (#3963) 2022-03-30 10:13:16 +02:00
aignatov-bio 1c50081de5
Add stock management toggling [SCI-6653] (#3967)
Co-authored-by: Anton <anton@scinote.net>
2022-03-29 12:33:28 +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
artoscinote 725549c8ca
Add alias to cell sort query, to prevent join conflicts [SCI-6649] (#3953)
* Add alias to cell sort query, to prevent join conflicts [SCI-6649]

* Added value_type to join condition to make use of DB index [SCI-6649]
2022-03-28 16:48:05 +02:00
Alex Kriuchykhin ea5ee65618
Fix large previews for csv files [SCI-6619] (#3961) 2022-03-28 16:32:18 +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
Alex Kriuchykhin 78a8b5d952
Add ordering to global search results [SCI-6639] (#3960) 2022-03-28 09:56:39 +02:00
Alex Kriuchykhin 5d111d3350
Improve error reporting in task status transition [SCI-6611] (#3952) 2022-03-25 15:38:15 +01: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 116dfa9247
Fix assign view for task repository [SCI-6648] (#3954)
Co-authored-by: Anton <anton@scinote.net>
2022-03-23 15:33:19 +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
artoscinote 97c15eaac0
Implement clearing hidden repository reminders [SCI-6507] (#3936) 2022-03-23 09:51:42 +01:00
ajugo 57daddc2e6
Hide options to add New Tags for users without permissions on Task level [SCI-6573] (#3945) 2022-03-22 15:15:25 +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
aignatov-bio e6ddefe63b
Add microtransactions to stock consumptions [SCI-6626] (#3948)
Co-authored-by: Anton <anton@scinote.net>
2022-03-22 13:33:12 +01:00
artoscinote 297cd02da7
Handle locked stock consumption state [SCI-6608] (#3942) 2022-03-18 15:02:15 +01:00
artoscinote 3527c409af
Hide reminders for archived repositories [SCI-6609] (#3941)
* Hide reminders for archived repositories [SCI-6609]

* Always pass repository in datatable helper [SCI-6609]
2022-03-18 14:46:24 +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
artoscinote 35dfa15e57
Implement hidden repository cell reminders [SCI-6504] (#3933) 2022-03-11 12:38:45 +01:00
Alex Kriuchykhin 378fbb6b76
Apply user's time zone in advanced filters for time data type [SCI-6585] (#3930) 2022-03-10 13:49:09 +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
artoscinote 06430c9340
Fix moving experiment [SCI-6602] (#3927) 2022-03-09 15:30:30 +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
aignatov-bio 7f7bf0533a
Fix tests [SCI-6486] (#3913)
* Fix tests [SCI-6486]

* Fix rspec tests [SCI-6486]

Co-authored-by: Anton <anton@scinote.net>
2022-03-09 14:12:16 +01:00
artoscinote 20ef08907a
Stock column fixes [SCI-6455] (#3878)
* Fix issues with stock column management [SCI-6455]

* Refactor stock column in datatables [SCI-6455]
2022-03-08 14:52:45 +01:00
Alex Kriuchykhin 96e6cd3c1d
Fix time range advanced filtering [SCI-6585] (#3922) 2022-03-08 10:20:53 +01:00
artoscinote 732977b80d
Fix fetching available repository rows [SCI-6601] (#3920) 2022-03-07 17:12:41 +01:00
artoscinote 8d096df826
Fix reload of edit column index [SCI-6598] (#3918) 2022-03-07 17:11:56 +01:00
artoscinote e948fc20bc
Fix members dropdown CSS, order [SCI-6595] (#3919) 2022-03-07 17:11:35 +01:00
aignatov-bio 881e6403aa
Fix rte table in docx report [SCI-6449] (#3916)
Co-authored-by: Anton <anton@scinote.net>
2022-03-03 14:12:06 +01:00
artoscinote f9a8358d72
Fix archived column hiding issue in snapshots, fix typos [SCI-6589] (#3915) 2022-03-03 13:52:56 +01:00
artoscinote ea6873b465
Implement low stock threshold column [SCI-6555] (#3907) 2022-03-03 11:13:17 +01:00
Alex Kriuchykhin 32d005f480
Fix step deletion for API [SCI-6561] (#3914) 2022-03-03 10:00:44 +01:00
artoscinote 87d202f3eb
Fix my_module_activities in AcitivtyService [SCI-6562] (#3908) 2022-03-01 12:28:45 +01:00
aignatov-bio 577f449b95
Fix repository table header [SCI-6559] (#3906)
Co-authored-by: Anton <anton@scinote.net>
2022-02-28 14:19:31 +01:00
artoscinote 4e118d095d
Fix dropdown component for group select [SCI-6583] (#3905) 2022-02-28 13:21:17 +01:00
aignatov-bio 99e8f7e3cb
Fix added on this month filter [SCI-6584] (#3904)
Co-authored-by: Anton <anton@scinote.net>
2022-02-28 11:16:29 +01:00
aignatov-bio 155b437d6a
Fix blank state for time filter [SCI-6590] (#3903)
Co-authored-by: Anton <anton@scinote.net>
2022-02-28 11:05:01 +01:00
aignatov-bio d54c7f1927
Fix save button dropdown for archived page [SCI-6581] (#3902)
Co-authored-by: Anton <anton@scinote.net>
2022-02-28 10:44:40 +01:00
Alex Kriuchykhin bd47893947
Add inventory archiving to the API [SCI-5584] (#3885) 2022-02-28 10:33:43 +01:00
Alex Kriuchykhin cc96a7e372
Fix advanced filters for numbers [SCI-6577] (#3899) 2022-02-28 10:31:42 +01:00
ajugo 493c7d64eb
Enable result comment button after canceling result edit [SCI-6537] (#3894)
* Enable result comment button after cancelling edit button [SCI-6537]
2022-02-25 22:32:21 +01:00
artoscinote 3df030b29e
Fix date/time filter loading and overwriting [SCI-6582] (#3898)
* Fix filter overwrite [SCI-6582]

* Fix date/time filter loading [SCI-6582]

* Fix time/time range filter loading [SCI-6582]

* Code style fixes [SCI-6582]
2022-02-25 15:27:31 +01:00
Alex Kriuchykhin c0e4b6f1f6
Fix advanced filters for added on field [SCI-6578] (#3895) 2022-02-25 14:30:37 +01:00
artoscinote 69964aae7b
Fix time range value filter [SCI-6580] (#3896) 2022-02-25 14:29:39 +01:00
aignatov-bio 7b4968a7a3
Fix archived on filters fix [SCI-6579] (#3897)
Co-authored-by: Anton <anton@scinote.net>
2022-02-25 14:29:27 +01:00
aignatov-bio 899f2efbd6
Fix blank state for dates range [SCI-6576] (#3893)
Co-authored-by: Anton <anton@scinote.net>
2022-02-24 12:47:32 +01:00
Alex Kriuchykhin fa6aeac1d9
Fix saving of time range values [SCI-6570] (#3892) 2022-02-24 09:43:15 +01:00
aignatov-bio f7cc20ebab
Update blank state for datetime filters [SCI-6571] (#3891)
Co-authored-by: Anton <anton@scinote.net>
2022-02-23 14:55:04 +01:00
artoscinote c097b321a7
Fix multiple saving bug for repository filters [SCI-6523] (#3890) 2022-02-23 14:30:28 +01:00
aignatov-bio d6c7305dfe
Move range filter logic to separate mixin (#3889)
Co-authored-by: Anton <anton@scinote.net>
2022-02-23 13:28:59 +01:00
aignatov-bio cf200a23a7
Fix datetime switch between operators [SCI-6571] (#3888)
Co-authored-by: Anton <anton@scinote.net>
2022-02-23 11:40:37 +01:00
aignatov-bio 91ab7d0b40
Update none of operator for assigned tasks [SCI-6572] (#3884)
Co-authored-by: Anton <anton@scinote.net>
2022-02-23 10:05:24 +01:00
Alex Kriuchykhin e750295b07
Fix filtering in repository snapshots [SCI-6423] (#3887) 2022-02-23 09:24:38 +01:00
aignatov-bio 3ae683307d
Fix time filter [SCI-6575] (#3886)
Co-authored-by: Anton <anton@scinote.net>
2022-02-23 09:24:11 +01:00
Alex Kriuchykhin dd5939e89d
Fix advanced filters for ID and Name columns [SCI-6496] (#3865) 2022-02-22 14:49:17 +01:00
artoscinote b8b7773a3f
Fix today, this month, this year operators [SCI-6527] (#3845) 2022-02-22 14:14:16 +01:00
artoscinote 463e1a8014
Fix date/time range filtering [SCI-6574] (#3882) 2022-02-22 13:29:50 +01:00
aignatov-bio 5a65b8689b
Fix blank state for between (#3883)
Co-authored-by: Anton <anton@scinote.net>
2022-02-22 12:55:40 +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 358ff50cc3
Update blank state for date filter [SCI-6541] (#3880)
Co-authored-by: Anton <anton@scinote.net>
2022-02-22 09:40:16 +01:00
aignatov-bio 1f45e3f01d
Fix for docx renderer [SCI-6540] (#3879)
Co-authored-by: Anton <anton@scinote.net>
2022-02-21 13:26:52 +01:00
Alex Kriuchykhin 6b51b8a35c
Fix handling of date values in repositories [SCI-6551] (#3877) 2022-02-21 12:08:35 +01:00
aignatov-bio 4877455e9c
Change date operator order [SCI-6544] (#3876)
Co-authored-by: Anton <anton@scinote.net>
2022-02-21 11:25:12 +01:00
aignatov-bio ed5b69c0ab
Add validation for date picker [SCI-6541] (#3875)
Co-authored-by: Anton <anton@scinote.net>
2022-02-21 11:10:50 +01:00
artoscinote cce6a17e8f
Perserve save filters button on toolbar reload [SCI-6553] (#3874) 2022-02-21 10:09:59 +01:00
aignatov-bio 0267bade3c
Add prepopulated datetime filters [SCI-6541] (#3869)
Co-authored-by: Anton <anton@scinote.net>
2022-02-18 11:25:51 +01:00
artoscinote c4a75d7543
Fix assignments after my module creation [SCI-6552] (#3871) 2022-02-18 11:25:30 +01:00
aignatov-bio 10821edbba
Update datetime filters operators [SCI-6544] (#3873)
Co-authored-by: Anton <anton@scinote.net>
2022-02-18 11:16:53 +01:00
artoscinote b9df85869c
View access modal fixes [SCI-6480] (#3870) 2022-02-18 10:19:13 +01:00
Alex Kriuchykhin f9e77991c6
Fix handling of empty values for numeric filter type [SCI-6543] (#3866) 2022-02-17 15:26:24 +01:00
artoscinote 8c0279e948
Fix red dot after clear filters [SCI-6536] (#3868) 2022-02-17 14:30:20 +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
artoscinote ff613c410c
Fix date format for repository filters [SCI-6528] (#3863) 2022-02-16 12:02:31 +01:00
artoscinote 39a014cfd4
Fix red dot for active filters [SCI-6536] (#3861) 2022-02-16 11:07:23 +01:00
artoscinote 5654eddbb0
Fix using multiple file filters [SCI-6533] (#3860) 2022-02-16 11:05:16 +01:00
ajugo 9b6a70cdb0
Improve RTF responsiveness - move button to the right side [SCI-5795] (#3854) 2022-02-16 10:32:01 +01:00
Alex Kriuchykhin 9c4fca1b86
Implement repository snapshots displaying on assigned items full view modal [SCI-6442] (#3862) 2022-02-16 09:40:48 +01:00
Alex Kriuchykhin fe44f6d22f
Fix advanced filters for archived_on column [SCI-6530] (#3859) 2022-02-15 18:02:08 +01:00
Alex Kriuchykhin ad0bd44b51
Allow multiple use of same column in advanced filters [SCI-6538] (#3857) 2022-02-15 18:01:53 +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
Alex Kriuchykhin 039c21d603
Disable management of repository filters for shared repositories with view permissions [SCI-6489] (#3856) 2022-02-15 14:37:42 +01:00
Alex Kriuchykhin 0ce6f43cbf
Fix inventory table custom error messages [SCI-6532] (#3855) 2022-02-15 14:37:26 +01:00
artoscinote fa6f883fc7
Fix ambiguous created_at column in added_on filter [SCI-6535] (#3852) 2022-02-14 15:03:50 +01:00
artoscinote 7c3904f4ac
Add missing icon [SCI-6492] (#3850) 2022-02-14 15:03:24 +01:00
artoscinote 40b2062775
Fix DateTime range filtering [SCI-6528] (#3851) 2022-02-14 13:52:38 +01:00
artoscinote af011a3bb8
Fixed full view assigned items modal stock consumption (#3846) 2022-02-14 10:42:48 +01:00
ajugo ba4e6476b7
Change subject of Repository (#3838) 2022-02-14 10:37:58 +01:00
Alex Kriuchykhin 6cc102cfd1
Fix advanced filters for list and status data types [SCI-6524][SCI-6521] (#3844) 2022-02-11 13:50:42 +01:00
aignatov-bio 97898fef7a
Add error handling for saving filters [SCI-6488] (#3835)
* Add error handling for saving filters [SCI-6488]

* Refactor and clean up filter element validations [SCI-6488]

Co-authored-by: Anton <anton@scinote.net>
Co-authored-by: Martin Artnik <martin@scinote.net>
2022-02-11 13:32:27 +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
aignatov-bio 24127af83f
Fix dropdown behavior for repository filters [SCI-6491] (#3842)
Co-authored-by: Anton <anton@scinote.net>
2022-02-11 11:42:31 +01:00
Alex Kriuchykhin 1e0966ac11
Fix advanced filtering for check list items [SCI-6522] (#3841) 2022-02-11 10:48:50 +01:00
Alex Kriuchykhin ed8ba13525
Fix advanced search for file type columns [SCI-6518] (#3839) 2022-02-11 10:47:32 +01:00
Alex Kriuchykhin 7216edd9bf
Fix permission checking for repository filters [SCI-6489] (#3831) 2022-02-11 10:47:18 +01:00
Alex Kriuchykhin 79c32e30ad
Add support of repository snapshots to assigned items section [SCI-6439] (#3828) 2022-02-11 10:46:19 +01:00
artoscinote a5888227f5
Fix designated users permission check, fix project access modal [SCI-6480] (#3815) 2022-02-11 10:46:00 +01:00
Alex Kriuchykhin b9204e1ce3
Add type specific indices for date time repository values [SCI-6485] (#3825) 2022-02-11 10:45:21 +01:00
aignatov-bio ad5326011f
Fix validation for number field in filters [SCI-6510] (#3836)
Co-authored-by: Anton <anton@scinote.net>
2022-02-11 10:41:25 +01:00
artoscinote bc5822de7b
Added error messges for missing search columns/values [SCI-6483] (#3824)
* Added error messges for missing search columns/values [SCI-6483]
2022-02-11 10:24:29 +01:00
artoscinote 553bde0bf5
Fix blank definition for user value filters [SCI-6509] (#3834) 2022-02-11 10:14:45 +01:00
artoscinote bac8fbbe58
Disable filter save button on submit [SCI-6523] (#3833) 2022-02-11 10:14:19 +01:00
aignatov-bio 1efe3ddd37
Add stock consumption to pdf and docx [SCI-6460] (#3816)
Co-authored-by: Anton <anton@scinote.net>
2022-02-11 10:09:52 +01:00
artoscinote f3c36a957b
Fix 'Last Week' filter in global activities [SCI-6481] (#3817) 2022-02-11 10:09:43 +01:00
artoscinote 85ad4a692a
Fix assigned task filter issues [SCI-6492] (#3837) 2022-02-11 09:20:52 +01:00
aignatov-bio e59b18e25d
Add default selection for filters [SCI-6484] (#3826)
Co-authored-by: Anton <anton@scinote.net>
2022-02-10 20:58:44 +01:00
aignatov-bio 8604319c1b
Add front-end validation for comments field [SCI-6464] (#3829)
Co-authored-by: Anton <anton@scinote.net>
2022-02-10 10:55:58 +01:00
artoscinote 8d90c8ebb7
Fix filter updates after item deletion [SCI-6490] (#3832) 2022-02-10 09:50:34 +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
artoscinote 96289b1188
Display text in smaller device navigation [SCI-5580] (#3821) 2022-02-04 11:37:26 +01:00
Alex Kriuchykhin e6010e3313
Fix repository filters to user relation [SCI-6263] (#3820) 2022-02-04 10:53:19 +01:00
Alex Kriuchykhin cc063a46b7
Fix time zone issues in advanced repository filters [SCI-6467] (#3819) 2022-02-04 10:30:11 +01:00
Alex Kriuchykhin 4627d15fc3
Implement import for repository stock values [SCI-6461] (#3818) 2022-02-04 10:29:48 +01:00
aignatov-bio ec6886735c
Add archived on column [SCI-6482] (#3823)
Co-authored-by: Anton <anton@scinote.net>
2022-02-03 13:18:15 +01:00
aignatov-bio 5223ce13f3
Fix assets operator markup error [SCI-6462] (#3822)
Co-authored-by: Anton <anton@scinote.net>
2022-02-03 12:32:19 +01:00
Alex Kriuchykhin 2a6b33deec
Fix downloading of BioEddie files in reports [SCI-6037] (#3623) 2022-02-02 10:41:57 +01:00
artoscinote f1e04cc604
Fix appearance of members pagination, copy fix [SCI-6265] (#3792) 2022-02-02 10:41:29 +01:00
artoscinote cdbf1f5fa0
Implement stock management activities [SCI-6452] (#3810)
* Implement stock management activities [SCI-6452]

* PR code fixes [SCI-6452]
2022-02-02 10:33:02 +01:00
aignatov-bio 0d6b2ad4b4
Add searchable list for advanced filters [SCI-6466] (#3808)
Co-authored-by: Anton <anton@scinote.net>
2022-02-01 14:39:04 +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
Alex Kriuchykhin fd92fed38f
Fix saving of advanced filters for shared repositories [SCI-6478] (#3811) 2022-02-01 09:59:31 +01:00
aignatov-bio 3fc5883172
Fix purple dots after applying empty filters [SCI-6458] (#3809)
Co-authored-by: Anton <anton@scinote.net>
2022-01-31 15:14:39 +01:00
Alex Kriuchykhin c1972e4fb2
Fix advanced filtering with multiple filters [SCI-6471] (#3807) 2022-01-31 11:10:39 +01:00
Alex Kriuchykhin fbcb94193a
Fix repository advanced filtering on time column [SCI-6467] (#3805) 2022-01-31 09:41:20 +01:00
aignatov-bio c8784d1f66
Add advanced filters for date/datetime/time range [SCI-6462] (#3806)
Co-authored-by: Anton <anton@scinote.net>
2022-01-31 09:21:08 +01:00
Martin Artnik b22fde2334 Handle stock management in full table views [SCI-6440] 2022-01-28 17:53:56 +01:00
Oleksii Kriuchykhin dd5f8c2793 Add stock management columns to snapshots [SCI-6448] 2022-01-28 13:19:37 +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
Oleksii Kriuchykhin 6d877e6bf7 Fix repository users list and filtering by row name [SCI-6457] 2022-01-27 22:50:04 +01:00
aignatov-bio 60859fec4e
Fix filtering for checklists, dropdown and status [SCI-6465] (#3802)
Co-authored-by: Anton <anton@scinote.net>
2022-01-27 14:01:09 +01:00
artoscinote 7de6d3d566
Merge pull request #3800 from artoscinote/ma_SCI_6474
Fix loading of saved filters [SCI-6474]
2022-01-27 13:43:35 +01:00
Martin Artnik 5a1329f1df Fix loading of saved filters [SCI-6474] 2022-01-27 13:33:43 +01:00
Martin Artnik 8a9be0cc3c Fix list of assigned tasks in assigned dropdown [SCI-6456] 2022-01-27 12:59:52 +01:00
Martin Artnik 8c8d26011d Fix bad merge of additionalDataFilter.vue 2022-01-26 11:05:09 +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
Oleksii Kriuchykhin 9f3b77ed15 Finalyze repository filter elements management backend [SCI-6396] 2022-01-26 10:12:46 +01:00
Alex Kriuchykhin e55c9ec1cc
Merge pull request #3785 from okriuchykhin/ok_SCI_6423
Fix filtering for repository snapshots [SCI-6423]
2022-01-25 12:59:46 +01:00
Alex Kriuchykhin 4a86a0ee45
Merge pull request #3771 from aignatov-bio/ai-sci-6325-user-sorting-in-assign-modals
Add A-Z sort for assignment modals [SCI-6325]
2022-01-25 12:59:15 +01:00
Alex Kriuchykhin b3c262bf2a
Merge pull request #3766 from okriuchykhin/ok_SCI_6400
Fix experiment caching issue [SCI-6400]
2022-01-25 12:58:56 +01:00
Alex Kriuchykhin a03e3e350b
Merge pull request #3763 from okriuchykhin/ok_SCI_6263
Fix user invitation with emails surrounded by spaces [SCI-6263]
2022-01-25 12:57:55 +01:00
Alex Kriuchykhin b0c3a33500
Merge pull request #3762 from okriuchykhin/ok_SCI_5584
Add handling of archiving/restoring inventory items to API [SCI-5584]
2022-01-25 12:57:22 +01:00
Alex Kriuchykhin c8ded68b8a
Merge pull request #3759 from okriuchykhin/ok_SCI_6189
Fix handling of Ctrl+S in TinyMCE editor [SCI-6189]
2022-01-25 12:57:10 +01:00
artoscinote 42a537390e
Group public users in experiments and tasks [SCI-6332] (#3769)
* Group public users in experiments and tasks [SCI-6332]

* Add list of users to the public users group elements [SCI-6404]
2022-01-25 12:41:36 +01:00
artoscinote 4ede001cf1
Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] (#3781)
* Fix invalid return in reports jobs [SCI-6409] (#3777)

* Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418]
2022-01-25 12:41:16 +01:00
artoscinote 790451c96f
Various fixes for BMT search [SCI-6077] (#3673)
* Various fixes for BMT search [SCI-6077]

* Add vue linter support [SCI-6077]
2022-01-25 12:28:38 +01:00
aignatov-bio 82aa26c282
Fix docx file preview [SCI-6299] (#3709)
Co-authored-by: Anton <anton@scinote.net>
2022-01-25 12:28:14 +01:00
aignatov-bio 2e4f687d31
Add experiment move error handling to project show [SCI-6398] (#3776)
Co-authored-by: Anton <anton@scinote.net>
2022-01-25 12:27:23 +01:00
Alex Kriuchykhin d2b5db13e9
Add stock and consumption to assigned items section [SCI-6434] (#3793) 2022-01-25 12:12:55 +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
Anton cbcba90a8e Fix markup [SCI-6325] 2022-01-25 10:10:57 +01:00
artoscinote 354bf4b808
Fix for Safari artefacts in TinyMCE [SCI-6154] (#3794) 2022-01-25 10:10:47 +01:00
Alex Kriuchykhin 5b335139e5
Merge pull request #3761 from artoscinote/ma_SCI_6388
Fix added_on filter, add specs [SCI-6388]
2022-01-24 16:47:03 +01:00
Martin Artnik 5fcf2cd080 Fix rendering of bmt/repository filters [SCI-6447] 2022-01-21 13:14:04 +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
Oleksii Kriuchykhin 5dd7ca2218 Fix representation of experiment workflow images [SCI-6431] 2022-01-19 18:07:55 +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 7425225520
Fix permission check for experiment moving (#3783)
Co-authored-by: Anton <anton@scinote.net>
2022-01-18 10:15:59 +01:00
Oleksii Kriuchykhin 34554e57e3 Fix filtering for repository snapshots [SCI-6423] 2022-01-17 21:53:13 +01:00
Martin Artnik caabb6ff00 Fix discarding a job due to non-existant report [SCI-6409] 2022-01-17 11:40:37 +01:00
Alex Kriuchykhin 3e714a4871
Merge pull request #3778 from okriuchykhin/ok_SCI_6402
Add initial implementation of inventory stock management [SCI-6402]
2022-01-17 11:21:08 +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
artoscinote 78b89733ab
Fix invalid return in reports jobs [SCI-6409] (#3777) 2022-01-13 14:36:09 +01:00
Oleksii Kriuchykhin a4d84e1a3b Add initial implementation of inventory stock management [SCI-6402] 2022-01-12 17:13:50 +01:00
aignatov-bio 3e85cc0b4a
Add UI for saving filters [SCI-6231] (#3768)
* Add UI for saving filters [SCI-6231]

* Fix ajax for deleting filters [6231]

Co-authored-by: Anton <anton@scinote.net>
Co-authored-by: Martin Artnik <martin@scinote.net>
2022-01-12 14:39:42 +01:00
Anton 304727257e Fix status column emojis [SCI-6407] 2022-01-11 11:27:00 +01:00
Anton 45d7718572 Add A-Z sort for assignment modals [SCI-6325] 2022-01-10 14:55:11 +01:00
Oleksii Kriuchykhin 8569a1dae7 Fix experiment caching issue [SCI-6400] 2022-01-07 14:27:52 +01:00
artoscinote 277b5f6eec
Fixed reCaptcha causing stack overflows on invite modal [SCI-6052] (#3534) 2022-01-06 10:11:20 +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
Oleksii Kriuchykhin a952e46e97 Fix user invitation with emails surrounded by spaces [SCI-6263] 2022-01-04 23:40:08 +01:00
Oleksii Kriuchykhin 200c282683 Add handling of archiving/restoring inventory items to API [SCI-5584] 2022-01-04 21:05:59 +01:00
Martin Artnik 66081950f0 Fix added_on filter, add specs [SCI-6388] 2022-01-04 19:20:02 +01:00