Commit graph

8210 commits

Author SHA1 Message Date
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