Commit b4247762 authored by Noel Alonso's avatar Noel Alonso
Browse files

añade campo a actividad

parent 2855fc23

src/main/java/es/redmic/models/es/administrative/dto/ActivityDTO.java

+16 −5
Original line number Diff line number Diff line
@@ -69,7 +69,10 @@ public class ActivityDTO extends ActivityBaseDTO { 
	private ThemeInspireDTO themeInspire;



	@Size(max = 5000)

	private String license;

	private String licence;



	@Size(max = 5000)

	private String normative;



	private String spatialExtension;
@@ -128,12 +131,20 @@ public class ActivityDTO extends ActivityBaseDTO { 
		this.themeInspire = themeInspire;

	}



	public String getLicense() {

		return this.license;

	public String getLicence() {

		return this.licence;

	}



	public void setLicence(String licence) {

		this.licence = licence;

	}



	public String getNormative() {

		return this.normative;

	}



	public void setLicense(String license) {

		this.license = license;

	public void setNormative(String normative) {

		this.normative = normative;

	}



	public String getSpatialExtension() {

src/main/java/es/redmic/models/es/administrative/model/Activity.java

+15 −5
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ public class Activity extends ActivityBase { 


	private ThemeInspire themeInspire;



	private String license;

	private String licence;



	private String normative;



	private String spatialExtension;
@@ -92,12 +94,20 @@ public class Activity extends ActivityBase { 
		this.themeInspire = themeInspire;

	}



	public String getLicense() {

		return this.license;

	public String getLicence() {

		return this.licence;

	}



	public void setLicence(String licence) {

		this.licence = licence;

	}



	public String getNormative() {

		return this.normative;

	}



	public void setLicense(String license) {

		this.license = license;

	public void setNormative(String normative) {

		this.normative = normative;

	}



	public String getSpatialExtension() {

src/test/java/es/redmic/test/unit/common/dto/CompleteDTOUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -125,7 +125,8 @@ public class CompleteDTOUtils { 
		activityDTO.setParent(completeProjectDTO());

		activityDTO.setGrandparent(completeProgramDTO());

		activityDTO.setThemeInspire(themeInspire);

		activityDTO.setLicense("license");

		activityDTO.setLicence("licence");

		activityDTO.setNormative("normative");

		activityDTO.setSpatialExtension("spatialExtension");

		activityDTO.setStarred(false);

		activityDTO.setResources(new ArrayList<>());