scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-14 21:24:54 +08:00
Code Issues Projects Releases Packages Wiki Activity
10572 commits 31 branches 181 tags 166 MiB
Commit graph

10572 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
dependabot[bot]
71a2588ca7
Bump puma from 5.6.2 to 5.6.4 (#3972) 
Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.6.2...v5.6.4)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-31 15:00:04 +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
ajugo
5cc97122e5
Viewer role does not see any tasks in archived project [SCI-6616] (#3958) 
* Fix viewer role not see any tasks in archived project [SCI-6616]

* Fix rollback for add read archive permission migration [SCI-6616]
 2022-03-30 11:01:26 +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
0341adf037
Add stock consumption permission to user roles [SCI-6665] (#3966) 2022-03-30 10:13:31 +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
dependabot[bot]
305df378ec
Bump lodash-es from 4.17.15 to 4.17.21 (#3939) 
Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21)

---
updated-dependencies:
- dependency-name: lodash-es
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-22 16:42:41 +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
Alex Kriuchykhin
186898b442
Add last_transition_error column to tasks [SCI-6610] (#3949) 2022-03-21 14:13:57 +01:00
Alex Kriuchykhin
91c97f1dea
Change env variable name for s3 bucket region [SCI-6603] (#3944) 2022-03-18 15:05:55 +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