Merge branch 'development' of https://github.com/xlg8/APMIS-Project.git…

… into development
AFG-Polio-Data · Sep 14, 2022 · f784a66 · f784a66
2 parents 3de077d + 1c02afa
commit f784a66
Show file tree

Hide file tree

Showing 17 changed files with 2,043 additions and 1,646 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/infrastructure/InfrastructureSyncDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/infrastructure/InfrastructureSyncDto.java
@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Set;
 
 import de.symeda.sormas.api.campaign.CampaignDto;
 import de.symeda.sormas.api.campaign.form.CampaignFormMetaDto;
@@ -11,6 +12,7 @@
 import de.symeda.sormas.api.feature.FeatureConfigurationDto;
 import de.symeda.sormas.api.infrastructure.area.AreaDto;
 import de.symeda.sormas.api.infrastructure.community.CommunityDto;
+import de.symeda.sormas.api.infrastructure.community.CommunityReferenceDto;
 import de.symeda.sormas.api.infrastructure.continent.ContinentDto;
 import de.symeda.sormas.api.infrastructure.country.CountryDto;
 import de.symeda.sormas.api.infrastructure.district.DistrictDto;
@@ -101,11 +103,14 @@ public void setDistricts(List<DistrictDto> districts) {
 	}
 
 	public List<CommunityDto> getCommunities() {
+		System.out.println("____________________++++!!!!: "+communities.toString());
 		return communities;
 	}
 
-	public void setCommunities(List<CommunityDto> communities) {
-		this.communities = communities;
+	public void setCommunities(List<CommunityDto> list) {
+		System.out.println("____________________++++####: "+list.toString());
+
+		this.communities = list;
 	}
 
 	public List<FacilityDto> getFacilities() {

diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java
@@ -223,7 +223,7 @@ public static void clearTables(boolean clearInfrastructure) {
 
 		try {
 			ConnectionSource connectionSource = getCaseDao().getConnectionSource();
-			TableUtils.clearTable(connectionSource, Case.class);
+		/*	TableUtils.clearTable(connectionSource, Case.class);
 			TableUtils.clearTable(connectionSource, Immunization.class);
 			TableUtils.clearTable(connectionSource, Vaccination.class);
 			TableUtils.clearTable(connectionSource, Treatment.class);
@@ -258,7 +258,7 @@ public static void clearTables(boolean clearInfrastructure) {
 			TableUtils.clearTable(connectionSource, SyncLog.class);
 			TableUtils.clearTable(connectionSource, DiseaseClassificationCriteria.class);
 			TableUtils.clearTable(connectionSource, CampaignFormData.class);
-			TableUtils.clearTable(connectionSource, LbdsSync.class);
+			TableUtils.clearTable(connectionSource, LbdsSync.class);*/
 
 			if (clearInfrastructure) {
 				TableUtils.clearTable(connectionSource, User.class);

diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/user/UserDtoHelper.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/user/UserDtoHelper.java
@@ -90,7 +90,7 @@ protected void fillInnerFromDto(User target, UserDto source) {
 
 		target.setRegion(DatabaseHelper.getRegionDao().getByReferenceDto(source.getRegion()));
 		target.setDistrict(DatabaseHelper.getDistrictDao().getByReferenceDto(source.getDistrict()));
-		target.setCommunity(DatabaseHelper.getCommunityDao().getByReferenceDto(source.getCommunity()));
+		//target.setCommunity(DatabaseHelper.getCommunityDao().getByReferenceDto(source.getCommunity()));
 		target.setHealthFacility(DatabaseHelper.getFacilityDao().getByReferenceDto(source.getHealthFacility()));
 		target.setPointOfEntry(DatabaseHelper.getPointOfEntryDao().getByReferenceDto(source.getPointOfEntry()));