Open
Conversation
…nvironmentProperty DAO classes IBP-3389
…cationDao IBP-3389
IBP-3389
# 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
…ectDao queries IBP-3389
IBP-3389
… be able to build webapp (for dev testing purposes) IBP-3389
IBP-3389
…riment types IBP-3389
# Conflicts: # src/main/resources/liquibase/crop_changelog/14_1_0.xml
IBP-3389
…ent, plot or sub-observation) IBP-3305
…m/IntegratedBreedingPlatform/Middleware into IBP-3305-GeolocationReengineering
…f a dataset IBP-3305
…D belongs to study. These can be used for validation instead of the heavy getDatasets method. IBP-3305
…and instance. IBP-3305
IBP-3305
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
…easurements. IBP-3305
…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
IBP-3305
IBP-3305
IBP-3305
…by trial instance number issue IBP-3305
IBP-3305 / IBP-3597
…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
IBP-3305 / IBP-3597
…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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Kindly review. Thanks!