Skip to content

Conversation

@mderamos
Copy link
Contributor

Kindly review. Thanks!

# Conflicts:
#	src/main/java/org/generationcp/middleware/dao/dms/GeolocationPropertyDao.java
#	src/main/java/org/generationcp/middleware/manager/StudyDataManagerImpl.java
#	src/test/java/org/generationcp/middleware/dao/dms/GeolocationPropertyDaoTest.java
… be able to build webapp (for dev testing purposes)

IBP-3389
# Conflicts:
#	src/main/resources/liquibase/crop_changelog/14_1_0.xml
darla-leafnode and others added 30 commits March 24, 2020 12:28
…D belongs to study. These can be used for validation instead of the heavy getDatasets method.

IBP-3305
# Conflicts:
#	src/main/java/org/generationcp/middleware/service/impl/study/StudyServiceImpl.java
#	src/test/java/org/generationcp/middleware/service/impl/study/StudyServiceImplTest.java
#	src/test/java/org/generationcp/middleware/service/impl/study/generation/ExperimentDesignServiceImplTest.java
…onment experiment. Since the query works for plot and sub-obs level, it is the join to environment experiment that causes slow performance.

IBP-3305
…ent metadata related to experimental design only if the dataset is the environment dataset

IBP-3305 / IBP-3597
…m/Middleware

# Conflicts:
#	src/main/java/org/generationcp/middleware/dao/dms/DmsProjectDao.java
#	src/main/java/org/generationcp/middleware/dao/dms/PhenotypeDao.java
#	src/main/java/org/generationcp/middleware/service/impl/study/StudyServiceImpl.java
#	src/test/java/org/generationcp/middleware/utils/test/IntegrationTestDataInitializer.java
…g if dataset type is sub-observation dataset

IBP-3305 / IBP-3597
…ObservationUnitSearchDao usage

IBP-3305 / IBP-3597
…asm entries with observed value that could be used for BV analysis

IBP-3597
…o pass if flag dataset is sub-observation dataset

IBP-3597
# Conflicts:
#	src/main/java/org/generationcp/middleware/service/Service.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants