gCubeSystem
/
geoportal-data-common
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added new field

This commit is contained in:
Francesco Mangiacrapa 2021-09-14 16:41:29 +02:00
parent dde561df2a
commit 0c0163e8e4
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/gcube/application/geoportalcommon/ConvertToDataViewModel.java
View File

@ -193,8 +193,11 @@ public class ConvertToDataViewModel {
theConcessione.setTitolariLicenza(concessione.getTitolareLicenza());
theConcessione.setTitolari(concessione.getTitolari());
if(includeValidationReport)
if(includeValidationReport) {
theConcessione.setValidationReport(toValidationReport(concessione.getReport()));
if(theConcessione.getValidationReport()!=null)
theConcessione.setValidationStatus(theConcessione.getValidationReport().getStatus());
}
LOG.debug("Returning base concessione: " + theConcessione);
return theConcessione;
@ -228,7 +231,7 @@ public class ConvertToDataViewModel {
* @throws Exception the exception
*/
public static BaseConcessioneDV toBaseConcessione(Concessione concessione) throws Exception {
LOG.debug("called toConcessione for: " + concessione);
LOG.debug("called toBaseConcessione for: " + concessione);
if (concessione == null)
return null;

13
src/main/java/org/gcube/application/geoportalcommon/shared/products/ConcessioneDV.java
View File

@ -11,6 +11,7 @@ import org.gcube.application.geoportalcommon.shared.products.model.LayerConcessi
import org.gcube.application.geoportalcommon.shared.products.model.RelazioneScavoDV;
import org.gcube.application.geoportalcommon.shared.products.model.UploadedImageDV;
import org.gcube.application.geoportalcommon.shared.products.model.ValidationReportDV;
import org.gcube.application.geoportalcommon.shared.products.model.ValidationReportDV.ValidationStatus;
/**
* The Class ConcessioneDV.
@ -94,6 +95,10 @@ public class ConcessioneDV extends BaseConcessioneDV implements Serializable {
private ValidationReportDV validationReport = null;
// Redundancy required by GUI.
//It is the value of ValidationReportDV::ValidationStatus.
private ValidationStatus validationStatus = null;
/**
* Instantiates a new concessione.
*/
@ -515,6 +520,14 @@ public class ConcessioneDV extends BaseConcessioneDV implements Serializable {
this.validationReport = validationReport;
}
public ValidationStatus getValidationStatus() {
return validationStatus;
}
public void setValidationStatus(ValidationStatus validationStatus) {
this.validationStatus = validationStatus;
}
/**
* To string.
*