Commit graph

11799 commits

Author SHA1 Message Date
Anton
f8f5791c62 Add negative validation for stock [SCI-6743] 2022-04-20 15:11:05 +02:00
aignatov-bio
159180d8b9
Merge pull request #4039 from aignatov-bio/ai-sci-6744-fix-default-units
Fix default stock column default units selection [SCI-6744]
2022-04-20 14:56:19 +02:00
Anton
e28095f781 Fix default stock column default units selection [SCI-6744] 2022-04-20 14:52:34 +02:00
aignatov-bio
d96a43506a
Merge pull request #4038 from aignatov-bio/ai-sci-6746-add-comment-to-stock-activity
Add comment to repository stock activities [SCI-6746]
2022-04-20 11:48:53 +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
a1570de3da
Merge pull request #4028 from aignatov-bio/ai-sci-6731-fix-edit-title-for-stock-consumption-modal
Add edit title for stock consumption modal [SCI-6731]
2022-04-15 14:43:58 +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
aignatov-bio
5a172eb474
Merge pull request #4027 from aignatov-bio/ai-sci-6732-fix-decimal-for-stock-consumption
Fix decimals in stock consumption modal [SCI-6732]
2022-04-15 14:42:47 +02:00
ajugo
1c21e11510
Stock management test [SCI-6420] (#3946)
* Initial test for stock management

* Repository stock values adding [does not work] SCI-6420

* Fix typos SCI-6420

* Fix test [SCI-6420]

* Test changes [SCI-6402]

* Remove locking test [SCI-6420]

* Remove lock [SCI-6420]

* Remove serializer [SCI-6420]

* Fix stock test and add ledger creation on consume [SCI-6420]
2022-04-15 12:23:47 +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
Alex Kriuchykhin
857661bbed
Merge pull request #3997 from aignatov-bio/ai-sci-6655-add-pagination-to-projects-page
Add pagination to projects list and experiment list [SCI-6655]
2022-04-13 12:56:54 +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
dependabot[bot]
ea772dd3ba
Bump moment from 2.24.0 to 2.29.2 (#4006)
Bumps [moment](https://github.com/moment/moment) from 2.24.0 to 2.29.2.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.24.0...2.29.2)

---
updated-dependencies:
- dependency-name: moment
  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-04-12 16:14:18 +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
dependabot[bot]
347a53efc7
Bump nokogiri from 1.13.3 to 1.13.4 (#4008)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4)

---
updated-dependencies:
- dependency-name: nokogiri
  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-04-12 13:45:56 +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