diff --git a/pom.xml b/pom.xml
index 0f89f67..bf2b1af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,21 @@
[3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT)
provided
+
+
+ xerces
+ xercesImpl
+ 2.9.1
+ provided
+
+
+
+ com.googlecode.gwtquery
+ gwtquery
+ 1.3.3
+ provided
+
@@ -77,9 +92,9 @@
org.gcube.data.spd
spd-model
1.0.0-SNAPSHOT
-
+
-
+ provided
@@ -171,15 +186,6 @@
-
-
- xerces
- xercesImpl
- 2.9.1
- provided
-
-
com.google.gwt
gwt-user
@@ -281,7 +287,7 @@
1.6.4
runtime
-
+
junit
junit
diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/occurrence/OccurrenceGridJob.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/occurrence/OccurrenceGridJob.java
index d44b9ca..0a5b4d6 100644
--- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/occurrence/OccurrenceGridJob.java
+++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/occurrence/OccurrenceGridJob.java
@@ -238,6 +238,8 @@ public class OccurrenceGridJob extends ContentPanel{
baseModelData.set(JobOccurrencesModel.FILEFORMAT, jobModel.getFileFormat());
baseModelData.set(JobOccurrencesModel.CSVTYPE, jobModel.getCsvType());
+ baseModelData.set(JobOccurrencesModel.STARTTIME, jobModel.getStartTime());
+
baseModelData.set(JobOccurrencesModel.ELAPSEDTIME, jobModel.getElapsedTime());
baseModelData.set(JobOccurrencesModel.COMPLETEDENTRY, jobModel.getNodeCompleted());
@@ -291,6 +293,7 @@ public class OccurrenceGridJob extends ContentPanel{
job.set(JobOccurrencesModel.STATUS, jobModel.getDownloadState().toString());
job.set(JobOccurrencesModel.ENDTIME, jobModel.getEndTime());
job.set(JobOccurrencesModel.ELAPSEDTIME, jobModel.getElapsedTime());
+ job.set(JobOccurrencesModel.STARTTIME, jobModel.getStartTime());
updateJobInfo(jobModel);
diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/taxonomy/TaxonomyGridJob.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/taxonomy/TaxonomyGridJob.java
index 8ec344b..62e6ac5 100644
--- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/taxonomy/TaxonomyGridJob.java
+++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/taxonomy/TaxonomyGridJob.java
@@ -236,6 +236,7 @@ public class TaxonomyGridJob extends ContentPanel{
baseModelData.set(JobTaxonomyModel.SUBMITTIME, jobModel.getSubmitTime());
baseModelData.set(JobTaxonomyModel.ENDTIME, jobModel.getEndTime());
+ baseModelData.set(JobTaxonomyModel.STARTTIME, jobModel.getStartTime());
baseModelData.set(JobTaxonomyModel.ELAPSEDTIME, jobModel.getElapsedTime());
baseModelData.set(JobTaxonomyModel.DATASOURCE, jobModel.getDataSource());
@@ -296,7 +297,7 @@ public class TaxonomyGridJob extends ContentPanel{
job.set(JobTaxonomyModel.STATUS, jobModel.getDownloadState().toString());
job.set(JobTaxonomyModel.ENDTIME, jobModel.getEndTime());
job.set(JobTaxonomyModel.ELAPSEDTIME, jobModel.getElapsedTime());
-
+ job.set(JobTaxonomyModel.STARTTIME, jobModel.getStartTime());
job.set(jobModel.getIdentifier(), jobModel); //Store jobModel
updateJobInfo(jobModel);
diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/job/OccurrenceJobUtil.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/job/OccurrenceJobUtil.java
index e71ea89..bce7280 100644
--- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/job/OccurrenceJobUtil.java
+++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/job/OccurrenceJobUtil.java
@@ -393,19 +393,19 @@ public class OccurrenceJobUtil {
}
- long startTimeInMillis = Calendar.getInstance().getTimeInMillis();
+ long submitTimeInMillis = Calendar.getInstance().getTimeInMillis();
try {
//STORE INTO DAO
- OccurrencesJob occurrenceJob = new OccurrencesJob(serviceJobId, jobModel.getJobName(), jobModel.getDescription(), jobModel.getScientificName(), dataSources, DownloadState.PENDING.toString(), "", startTimeInMillis, 0, jobModel.getFileFormat().toString(),csvTypeString, jobModel.isByDataSource(), convertListKeyIntoStoreXMLString(keys), expectedOccurrence);
+ OccurrencesJob occurrenceJob = new OccurrencesJob(serviceJobId, jobModel.getJobName(), jobModel.getDescription(), jobModel.getScientificName(), dataSources, DownloadState.PENDING.toString(), "", submitTimeInMillis, 0, 0, jobModel.getFileFormat().toString(),csvTypeString, jobModel.isByDataSource(), convertListKeyIntoStoreXMLString(keys), expectedOccurrence);
//for debug
// System.out.println("INTO createOccurrenceJobOnServiceByKeys " + occurrenceJob);
occurrencesJobDao.insert(occurrenceJob);
- Date start = DateUtil.millisecondsToDate(startTimeInMillis);
+ Date start = DateUtil.millisecondsToDate(submitTimeInMillis);
jobModel.setSubmitTime(start);
//FILL MODEL WITH OTHER DATA
diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/job/TaxonomyJobUtil.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/job/TaxonomyJobUtil.java
index 3a5cba7..e8c6bbf 100644
--- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/job/TaxonomyJobUtil.java
+++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/job/TaxonomyJobUtil.java
@@ -120,6 +120,10 @@ public class TaxonomyJobUtil {
//SET START TIME
long startTime = job.getStartTime();
+
+// System.out.println("statusResponse.getStartDate(): "+statusResponse.getStartDate());
+// System.out.println("startTime: "+startTime);
+
if(statusResponse.getStartDate()!=null && startTime==0){ //UPDATE start time first time only
Date start = DateUtil.millisecondsToDate(statusResponse.getStartDate().getTimeInMillis());
// jobSpeciesModel.setStartTime(DateUtil.dateToDateFormatString(start));
diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/shared/OccurrencesJob.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/shared/OccurrencesJob.java
index 8e33f10..3d536b5 100644
--- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/shared/OccurrencesJob.java
+++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/shared/OccurrencesJob.java
@@ -84,9 +84,10 @@ public class OccurrencesJob implements Serializable {
* @param resultRowKeys
* @param expectedOccurrence
*/
- public OccurrencesJob(String jobId, String jobName, String jobDescription, String scientificName, List dataSources, String state, String storage, long submitTime, long endTime, String fileFormat, String csvType, boolean isByDataSource, String resultRowKeys, int expectedOccurrence) {
+ public OccurrencesJob(String jobId, String jobName, String jobDescription, String scientificName, List dataSources, String state, String storage, long submitTime, long startTime, long endTime, String fileFormat, String csvType, boolean isByDataSource, String resultRowKeys, int expectedOccurrence) {
this.id = jobId;
this.name = jobName;
+ this.startTime = startTime;
this.submitTime = submitTime;
this.endTime = endTime;
this.state = state;
diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/shared/TaxonomyJob.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/shared/TaxonomyJob.java
index 6d25cca..05958c1 100644
--- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/shared/TaxonomyJob.java
+++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/shared/TaxonomyJob.java
@@ -170,9 +170,9 @@ public class TaxonomyJob implements Serializable {
return startTime;
}
- public void setStartTime(long startTime) {
- this.startTime = startTime;
- }
+// public void setStartTime(long startTime) {
+// this.startTime = startTime;
+// }
@Override
public String toString() {