Merge pull request SORMAS-Foundation#3 from meajt/feature/maleria_for…

…m_update

Feature/maleria form update

sormas-api/src/main/java/de/symeda/sormas/api/epidata/ActiveCaseDetection.java

@@ -1,9 +1,15 @@
 package de.symeda.sormas.api.epidata;
 
+import de.symeda.sormas.api.i18n.I18nProperties;
+
 public enum ActiveCaseDetection {
     HOUSE_TO_HOUSE_VISIT,
     MOBILE_MALARIA_CLINIC,
     CONTACT_SURVEY,
     FEVER_SURVEY,
-    POPULATION_BASE_SURVEY
+    POPULATION_BASE_SURVEY;
+    @Override
+    public String toString() {
+        return I18nProperties.getEnumCaption(this);
+    }
 }

sormas-api/src/main/java/de/symeda/sormas/api/epidata/CaseDetectionMethod.java

@@ -1,6 +1,12 @@
 package de.symeda.sormas.api.epidata;
 
+import de.symeda.sormas.api.i18n.I18nProperties;
+
 public enum CaseDetectionMethod {
     ACTIVE_CASE_DETECTION,
-    PASSIVE_CASE_DETECTION
+    PASSIVE_CASE_DETECTION;
+    @Override
+    public String toString() {
+        return I18nProperties.getEnumCaption(this);
+    }
 }

sormas-api/src/main/java/de/symeda/sormas/api/epidata/EpiDataDto.java

@@ -52,10 +52,15 @@ public class EpiDataDto extends PseudonymizableDto {
 	public static final String HIGH_TRANSMISSION_RISK_AREA = "highTransmissionRiskArea";
 	public static final String LARGE_OUTBREAKS_AREA = "largeOutbreaksArea";
 
+	@Diseases(value = {Disease.MALARIA}, hide = true)
 	private YesNoUnknown exposureDetailsKnown;
+	@Diseases(value = {Disease.MALARIA}, hide = true)
 	private YesNoUnknown activityAsCaseDetailsKnown;
+	@Diseases(value = {Disease.MALARIA}, hide = true)
 	private YesNoUnknown contactWithSourceCaseKnown;
+	@Diseases(value = {Disease.MALARIA}, hide = true)
 	private YesNoUnknown highTransmissionRiskArea;
+	@Diseases(value = {Disease.MALARIA}, hide = true)
 	private YesNoUnknown largeOutbreaksArea;
 	@Diseases({
 		Disease.AFP,
@@ -68,10 +73,13 @@ public class EpiDataDto extends PseudonymizableDto {
 	private YesNoUnknown areaInfectedAnimals;
 
 	@Valid
+	@Diseases(value = {Disease.MALARIA}, hide = true)
 	private List<ExposureDto> exposures = new ArrayList<>();
 
 	@Valid
+	@Diseases(value = {Disease.MALARIA}, hide = true)
 	private List<ActivityAsCaseDto> activitiesAsCase = new ArrayList<>();
+	private MalariaEpiDataDto malariaEpiData;
 
 	public YesNoUnknown getExposureDetailsKnown() {
 		return exposureDetailsKnown;
@@ -165,4 +173,12 @@ public EpiDataDto clone() throws CloneNotSupportedException {
 
 		return clone;
 	}
+
+	public MalariaEpiDataDto getMalariaEpiData() {
+		return malariaEpiData;
+	}
+
+	public void setMalariaEpiData(MalariaEpiDataDto malariaEpiData) {
+		this.malariaEpiData = malariaEpiData;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/epidata/MalariaEpiDataDto.java

@@ -85,7 +85,7 @@ public class MalariaEpiDataDto extends PseudonymizableDto {
     @PersonalData
     private Boolean hasPreviousMalaria;
     private RegionReferenceDto pastRegion;
-    private RegionReferenceDto pastDate;
+    private Date pastDate;
     @PersonalData
     private DistrictReferenceDto pastDistrict;
     @PersonalData
@@ -115,11 +115,11 @@ public void setActiveCaseDetection(ActiveCaseDetection activeCaseDetection) {
         this.activeCaseDetection = activeCaseDetection;
     }
 
-    public RegionReferenceDto getPastDate() {
+    public Date getPastDate() {
         return pastDate;
     }
 
-    public void setPastDate(RegionReferenceDto pastDate) {
+    public void setPastDate(Date pastDate) {
         this.pastDate = pastDate;
     }
 

sormas-api/src/main/java/de/symeda/sormas/api/epidata/PreventiveMeasures.java

@@ -1,9 +1,15 @@
 package de.symeda.sormas.api.epidata;
 
+import de.symeda.sormas.api.i18n.I18nProperties;
+
 public enum PreventiveMeasures {
     NOT_TAKEN,
     NORMAL_NET,
     LLIN,
     CHEMOPROPHYLAXIS,
-    OTHER
+    OTHER;
+    @Override
+    public String toString() {
+        return I18nProperties.getEnumCaption(this);
+    }
 }

sormas-api/src/main/java/de/symeda/sormas/api/symptoms/PlasmodiumSpecies.java

@@ -1,11 +1,17 @@
 package de.symeda.sormas.api.symptoms;
 
+import de.symeda.sormas.api.i18n.I18nProperties;
+
 public enum PlasmodiumSpecies {
     VIVAX,
     FALCIPARUM,
     OVALE,
     MALARIEA,
     KNOWLESI,
     MIXED_INFECTION,
-    UN_KNOW
+    UNKNOWN;
+    @Override
+    public String toString() {
+        return I18nProperties.getEnumCaption(this);
+    }
 }

sormas-api/src/main/resources/enum.properties

@@ -2178,10 +2178,27 @@ S2SOwnershipStatusFilter.ALL=All
 ShareRequestViewType.INCOMING=Incoming
 ShareRequestViewType.OUTGOING=Outgoing
 
+
+CaseDetectionMethod.ACTIVE_CASE_DETECTION=Active Case Detection
+CaseDetectionMethod.PASSIVE_CASE_DETECTION=Passive Case Detection
+
+ActiveCaseDetection.HOUSE_TO_HOUSE_VISIT=House to house visit
+ActiveCaseDetection.MOBILE_MALARIA_CLINIC=Mobile malaria clinic
+ActiveCaseDetection.CONTACT_SURVEY=Contact Survey
+ActiveCaseDetection.FEVER_SURVEY=Fever Survey
+ActiveCaseDetection.POPULATION_BASE_SURVEY=Population base survey
+
+PreventiveMeasures.NOT_TAKEN=Not taken
+PreventiveMeasures.NORMAL_NET=Normal net
+PreventiveMeasures.LLIN=LLIN
+PreventiveMeasures.CHEMOPROPHYLAXIS=Chemoprophylaxis
+PreventiveMeasures.OTHER=Other
+
 # Ethnicity
 Ethnicity.DALIT=Dalit
 Ethnicity.JANAJATI=Janajat
 Ethnicity.MADHESI=Madhesi
 Ethnicity.MUSLIM=Muslim
 Ethnicity.BRAHMIN=Brahmin
 Ethnicity.OTHER=Others
+

sormas-api/src/main/resources/enum_ne-NP.properties

@@ -2165,10 +2165,35 @@ S2SOwnershipStatusFilter.ALL=All
 ShareRequestViewType.INCOMING=Incoming
 ShareRequestViewType.OUTGOING=Outgoing
 
+
+CaseDetectionMethod.ACTIVE_CASE_DETECTION=Active Case Detection
+CaseDetectionMethod.PASSIVE_CASE_DETECTION=Passive Case Detection
+
+ActiveCaseDetection.HOUSE_TO_HOUSE_VISIT=House to house visit
+ActiveCaseDetection.MOBILE_MALARIA_CLINIC=Mobile malaria clinic
+ActiveCaseDetection.CONTACT_SURVEY=Contact Survey
+ActiveCaseDetection.FEVER_SURVEY=Fever Survey
+ActiveCaseDetection.POPULATION_BASE_SURVEY=Population base survey
+
+PreventiveMeasures.NOT_TAKEN=Not taken
+PreventiveMeasures.NORMAL_NET=Normal net
+PreventiveMeasures.LLIN=LLIN
+PreventiveMeasures.CHEMOPROPHYLAXIS=Chemoprophylaxis
+PreventiveMeasures.OTHER=Other
+
+PlasmodiumSpecies.VIVAX=Vivax
+PlasmodiumSpecies.FALCIPARUM=Falciparum
+PlasmodiumSpecies.OVALE=Ovale
+PlasmodiumSpecies.MALARIEA=Malaria
+PlasmodiumSpecies.KNOWLESI=Knowlesi
+PlasmodiumSpecies.MIXED_INFECTION=Mixed Infection
+PlasmodiumSpecies.UNKNOWN=Unknown
+
 # Ethnicity
 Ethnicity.DALIT=Dalit
 Ethnicity.JANAJATI=Janajat
 Ethnicity.MADHESI=Madhesi
 Ethnicity.MUSLIM=Muslim
 Ethnicity.BRAHMIN=Brahmin
 Ethnicity.OTHER=Others
+

sormas-backend/src/main/java/de/symeda/sormas/backend/epidata/EpiData.java

@@ -21,11 +21,7 @@
 import java.util.Date;
 import java.util.List;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.OneToMany;
+import javax.persistence.*;
 
 import de.symeda.auditlog.api.Audited;
 import de.symeda.sormas.api.utils.YesNoUnknown;
@@ -57,6 +53,7 @@ public class EpiData extends AbstractDomainObject {
 	private List<ActivityAsCase> activitiesAsCase = new ArrayList<>();
 	@NotExposedToApi
 	private Date changeDateOfEmbeddedLists;
+	private MalariaEpiData malariaEpiData;
 
 	@Enumerated(EnumType.STRING)
 	public YesNoUnknown getExposureDetailsKnown() {
@@ -140,4 +137,12 @@ public YesNoUnknown getContactWithSourceCaseKnown() {
 	public void setContactWithSourceCaseKnown(YesNoUnknown contactWithSourceCaseKnown) {
 		this.contactWithSourceCaseKnown = contactWithSourceCaseKnown;
 	}
+	@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true)
+	public MalariaEpiData getMalariaEpiData() {
+		return malariaEpiData;
+	}
+
+	public void setMalariaEpiData(MalariaEpiData malariaEpiData) {
+		this.malariaEpiData = malariaEpiData;
+	}
 }

sormas-backend/src/main/java/de/symeda/sormas/backend/epidata/EpiDataFacadeEjb.java

@@ -17,6 +17,7 @@
  *******************************************************************************/
 package de.symeda.sormas.backend.epidata;
 
+import static de.symeda.sormas.backend.epidata.MalariaEpiDataFacadeEjb.*;
 import static java.util.Objects.isNull;
 
 import java.util.ArrayList;
@@ -58,6 +59,8 @@ public class EpiDataFacadeEjb implements EpiDataFacade {
 	private ContactService contactService;
 	@EJB
 	private UserService userService;
+	@EJB
+	private MalariaEpiDataFacadeEjbLocal malariaEpiDataFacadeEjbLocal;
 
 	public EpiData fillOrBuildEntity(EpiDataDto source, EpiData target, boolean checkChangeDate) {
 		if (source == null) {
@@ -100,7 +103,7 @@ public EpiData fillOrBuildEntity(EpiDataDto source, EpiData target, boolean chec
 		}
 		target.getActivitiesAsCase().clear();
 		target.getActivitiesAsCase().addAll(activitiesAsCase);
-
+		target.setMalariaEpiData(malariaEpiDataFacadeEjbLocal.fillOrBuildEntity(source.getMalariaEpiData(), target.getMalariaEpiData(), checkChangeDate));
 		return target;
 	}
 
@@ -241,7 +244,7 @@ public static EpiDataDto toDto(EpiData epiData) {
 			activityAsCaseDtos.add(activityAsCaseDto);
 		}
 		target.setActivitiesAsCase(activityAsCaseDtos);
-
+		target.setMalariaEpiData(MalariaEpiDataFacadeEjb.toDto(source.getMalariaEpiData()));
 		return target;
 	}