Commit graph

1725 commits

Author SHA1 Message Date
Anton b56f11fc18 Add negative validation for treshold [SCI-6743] 2022-04-25 12:18:22 +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
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
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
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 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
artoscinote 04ab92b8e2
Fix removing stock reminder threshold [SCI-6724] (#4010) 2022-04-13 11:35:45 +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 1385c6964c
Fix sorting by time and time range columns [SCI-6683] (#4011) 2022-04-12 15:56:20 +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
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
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 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 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
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
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 5d111d3350
Improve error reporting in task status transition [SCI-6611] (#3952) 2022-03-25 15:38:15 +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 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 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
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
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
Alex Kriuchykhin 96e6cd3c1d
Fix time range advanced filtering [SCI-6585] (#3922) 2022-03-08 10:20:53 +01:00
artoscinote ea6873b465
Implement low stock threshold column [SCI-6555] (#3907) 2022-03-03 11:13:17 +01:00
Alex Kriuchykhin cc96a7e372
Fix advanced filters for numbers [SCI-6577] (#3899) 2022-02-28 10:31:42 +01:00
artoscinote 69964aae7b
Fix time range value filter [SCI-6580] (#3896) 2022-02-25 14:29:39 +01:00
Alex Kriuchykhin e750295b07
Fix filtering in repository snapshots [SCI-6423] (#3887) 2022-02-23 09:24:38 +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
Alex Kriuchykhin 6b51b8a35c
Fix handling of date values in repositories [SCI-6551] (#3877) 2022-02-21 12:08:35 +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 5654eddbb0
Fix using multiple file filters [SCI-6533] (#3860) 2022-02-16 11:05:16 +01:00
artoscinote 40b2062775
Fix DateTime range filtering [SCI-6528] (#3851) 2022-02-14 13:52:38 +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
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 79c32e30ad
Add support of repository snapshots to assigned items section [SCI-6439] (#3828) 2022-02-11 10:46: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 8d90c8ebb7
Fix filter updates after item deletion [SCI-6490] (#3832) 2022-02-10 09:50:34 +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
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
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
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
Oleksii Kriuchykhin 9f3b77ed15 Finalyze repository filter elements management backend [SCI-6396] 2022-01-26 10:12:46 +01:00
Alex Kriuchykhin d2b5db13e9
Add stock and consumption to assigned items section [SCI-6434] (#3793) 2022-01-25 12:12:55 +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
Oleksii Kriuchykhin a4d84e1a3b Add initial implementation of inventory stock management [SCI-6402] 2022-01-12 17:13:50 +01:00
aignatov-bio 5512db18f0
Fix state for bmt repository [SCI-6089] (#3758)
Co-authored-by: Anton <anton@scinote.net>
2022-01-03 12:34:06 +01:00
Martin Artnik 023b68bfac Fixed datatable columns for BMT repo [SCI-6385] 2021-12-21 15:15:34 +01:00
Oleksii Kriuchykhin 738da6094f Add advanced filters to repository datatable service [SCI-6210] 2021-12-21 12:38:52 +01:00
Martin Artnik f3cc31052b Amend BMT repository default columns [SCI-6385] 2021-12-21 12:19:19 +01:00
Martin Artnik 9026029a26 Fix BMT repository default state [SCI-6386] 2021-12-20 16:19:17 +01:00
Martin Artnik c9e4a9bab7 Merge branch 'master' into features/bmt-search 2021-12-20 13:08:20 +01:00
Anton a3971caeb5 Update import row for list and checklist items [SCI-6383] 2021-12-17 12:26:58 +01:00
Oleksii Kriuchykhin cd04b453f1 Use the last status flow as a default one for new tasks [SCI-6098] 2021-12-15 11:53:19 +01:00
Oleksii Kriuchykhin e67b17dd6f Optimize loading of project and experiment cards [SCI-6346] 2021-12-13 16:43:16 +01:00
Oleksii Kriuchykhin 8f1b201061 Improve activities loading speed [SCI-6345] 2021-12-09 19:28:27 +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
Oleksii Kriuchykhin 30031e2f07 Fix user removal from a team [SCI-6323] 2021-12-06 14:24:59 +01:00
Alex Kriuchykhin 245f0aedd7
Fix user removal from a team [SCI-6323] (#3718) 2021-12-03 16:26:19 +01:00
Oleksii Kriuchykhin a8ad7ef826 Add models and controller for repository table filters [SCI-6209] 2021-12-02 14:25:23 +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 16b3ee3d94
Add non-cyclical validation to connections [SCI-6287] (#3702)
* Add non-cyclical validation to connections [SCI-6287]

* Prevent theoretical infinite loop possiblity [SCI-6287]
2021-12-01 11:14:01 +01:00
Martin Artnik 8a78b8376b Make all except public project assignments manual [SCI-6292] 2021-11-23 10:56:28 +01:00
Oleksii Kriuchykhin a1c4d06e3e Add endpoint for fetching column data including connected items [SCI-6208] 2021-11-22 22:48:36 +01:00
Anton a44dd8c915 Merge branch 'features/bmt-search' into features/repository-filters 2021-11-22 14:24:28 +01:00