Commit graph

1509 commits

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