Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
R
reefdb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
quadrige
reefdb
Commits
e4878826
Commit
e4878826
authored
Jan 08, 2020
by
PECQUOT
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some refactoring due to schema changes from quadrige3-core 3.6.0
Signed-off-by:
lp1ee9d
<
ludovic.pecquot@e-is.pro
>
parent
94e1917c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
pom.xml
pom.xml
+1
-1
reefdb-core/src/main/java/fr/ifremer/reefdb/dao/administration/strategy/ReefDbStrategyDaoImpl.java
...db/dao/administration/strategy/ReefDbStrategyDaoImpl.java
+1
-1
reefdb-core/src/main/java/fr/ifremer/reefdb/dao/data/measurement/ReefDbMeasurementDaoImpl.java
...reefdb/dao/data/measurement/ReefDbMeasurementDaoImpl.java
+2
-2
reefdb-core/src/main/java/fr/ifremer/reefdb/dao/data/samplingoperation/ReefDbSamplingOperationDaoImpl.java
...ata/samplingoperation/ReefDbSamplingOperationDaoImpl.java
+2
-2
reefdb-core/src/main/java/fr/ifremer/reefdb/dao/data/survey/ReefDbSurveyDaoImpl.java
...r/ifremer/reefdb/dao/data/survey/ReefDbSurveyDaoImpl.java
+1
-1
No files found.
pom.xml
View file @
e4878826
...
...
@@ -171,7 +171,7 @@
<maven.compiler.debug>
true
</maven.compiler.debug>
<!-- Quadrige3 Core version -->
<quadrige3-core.version>
3.
5.6
</quadrige3-core.version>
<quadrige3-core.version>
3.
6.0-SNAPSHOT
</quadrige3-core.version>
<!-- Last ReefDb launcher version -->
<launcherVersion>
3.0.3
</launcherVersion>
...
...
reefdb-core/src/main/java/fr/ifremer/reefdb/dao/administration/strategy/ReefDbStrategyDaoImpl.java
View file @
e4878826
...
...
@@ -359,7 +359,7 @@ public class ReefDbStrategyDaoImpl extends StrategyDaoImpl implements ReefDbStra
pmfmStrategy
=
PmfmStrategy
.
Factory
.
newInstance
();
Integer
newId
=
TemporaryDataHelper
.<
Integer
>
getNewNegativeIdForTemporaryData
(
getSession
(),
pmfmStrategy
.
getClass
());
pmfmStrategy
.
setPmfmStratId
(
newId
);
pmfmStrategy
.
setPmfmStratParAcquisNumber
(
1
d
);
pmfmStrategy
.
setPmfmStratParAcquisNumber
(
1
);
}
savePmfmStrategy
(
psfmProgStrat
,
pmfmStrategy
,
rank
++);
...
...
reefdb-core/src/main/java/fr/ifremer/reefdb/dao/data/measurement/ReefDbMeasurementDaoImpl.java
View file @
e4878826
...
...
@@ -475,7 +475,7 @@ public class ReefDbMeasurementDaoImpl extends MeasurementDaoImpl implements Reef
// save as numeric value
target
.
setMeasNumerValue
(
measurement
.
getNumericalValue
()
==
null
?
null
:
measurement
.
getNumericalValue
().
floatValue
());
target
.
setMeasPrecisionValue
(
measurement
.
getPrecision
()
==
null
?
null
:
measurement
.
getPrecision
().
floatValue
());
target
.
setMeasDigitNumber
(
measurement
.
getDigitNb
()
==
null
?
null
:
measurement
.
getDigitNb
().
doubleValue
()
);
target
.
setMeasDigitNumber
(
measurement
.
getDigitNb
());
target
.
setQualitativeValue
(
null
);
}
...
...
@@ -593,7 +593,7 @@ public class ReefDbMeasurementDaoImpl extends MeasurementDaoImpl implements Reef
// save as numeric value
target
.
setTaxonMeasNumerValue
(
measurement
.
getNumericalValue
()
==
null
?
null
:
measurement
.
getNumericalValue
().
floatValue
());
target
.
setTaxonMeasPrecisionValue
(
measurement
.
getPrecision
()
==
null
?
null
:
measurement
.
getPrecision
().
floatValue
());
target
.
setTaxonMeasDigitNumber
(
measurement
.
getDigitNb
()
==
null
?
null
:
measurement
.
getDigitNb
().
doubleValue
()
);
target
.
setTaxonMeasDigitNumber
(
measurement
.
getDigitNb
());
target
.
setQualitativeValue
(
null
);
}
...
...
reefdb-core/src/main/java/fr/ifremer/reefdb/dao/data/samplingoperation/ReefDbSamplingOperationDaoImpl.java
View file @
e4878826
...
...
@@ -351,7 +351,7 @@ public class ReefDbSamplingOperationDaoImpl extends SamplingOperationDaoImpl imp
private
void
beanToEntity
(
SamplingOperationDTO
bean
,
SamplingOperation
entity
,
Survey
survey
)
{
entity
.
setSamplingOperLb
(
bean
.
getName
());
entity
.
setSamplingOperTime
(
bean
.
getTime
()
!=
null
?
Double
.
valueOf
(
bean
.
getTime
())
:
null
);
entity
.
setSamplingOperTime
(
bean
.
getTime
());
entity
.
setSamplingOperUtFormat
(
survey
.
getSurveyUtFormat
());
entity
.
setSamplingOperCm
(
bean
.
getComment
());
entity
.
setSamplingOperControlDt
(
bean
.
getControlDate
());
...
...
@@ -395,7 +395,7 @@ public class ReefDbSamplingOperationDaoImpl extends SamplingOperationDaoImpl imp
entity
.
setDepthUnit
(
null
);
}
entity
.
setSamplingOperNumberIndiv
(
bean
.
getIndividualCount
()
==
null
?
null
:
Double
.
valueOf
(
bean
.
getIndividualCount
())
);
entity
.
setSamplingOperNumberIndiv
(
bean
.
getIndividualCount
());
if
(
bean
.
getPositioning
()
==
null
)
{
entity
.
setPositionningSystem
(
null
);
...
...
reefdb-core/src/main/java/fr/ifremer/reefdb/dao/data/survey/ReefDbSurveyDaoImpl.java
View file @
e4878826
...
...
@@ -738,7 +738,7 @@ public class ReefDbSurveyDaoImpl extends SurveyDaoImpl implements ReefDbSurveyDa
}
// optional attributes
entity
.
setSurveyTime
(
bean
.
getTime
()
!=
null
?
Double
.
valueOf
(
bean
.
getTime
())
:
null
);
entity
.
setSurveyTime
(
bean
.
getTime
());
entity
.
setSurveyLb
(
bean
.
getName
());
entity
.
setSurveyCm
(
bean
.
getComment
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment